Change namespace chromeos => ash for //c/b/ash/customization
Code in //chrome/browser/ash/customization is a part of the ash-chrome,
so namespace is changed to ash from chromeos.
To avoid churn during other namespace transitions in future, this CL has
temporary 'using' declarations.
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I3cce382762ab730dba3e720c2b51e6c0010616e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2838789
Commit-Queue: Yeunjoo Choi <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/master@{#875490}
diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc
index 98f08da1..16cb428 100644
--- a/chrome/browser/ash/customization/customization_document.cc
+++ b/chrome/browser/ash/customization/customization_document.cc
@@ -54,7 +54,7 @@
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/simple_url_loader.h"
-namespace chromeos {
+namespace ash {
namespace {
// Manifest attributes names.
@@ -289,11 +289,11 @@
&startup_customization_manifest);
LoadManifestFromFile(startup_customization_manifest);
}
- Init(system::StatisticsProvider::GetInstance());
+ Init(chromeos::system::StatisticsProvider::GetInstance());
}
StartupCustomizationDocument::StartupCustomizationDocument(
- system::StatisticsProvider* statistics_provider,
+ chromeos::system::StatisticsProvider* statistics_provider,
const std::string& manifest)
: CustomizationDocument(kAcceptedManifestVersion) {
LoadManifestFromString(manifest);
@@ -309,7 +309,7 @@
}
void StartupCustomizationDocument::Init(
- system::StatisticsProvider* statistics_provider) {
+ chromeos::system::StatisticsProvider* statistics_provider) {
if (IsReady()) {
root_->GetString(kInitialLocaleAttr, &initial_locale_);
root_->GetString(kInitialTimezoneAttr, &initial_timezone_);
@@ -317,7 +317,7 @@
std::string hwid;
if (statistics_provider->GetMachineStatistic(
- system::kHardwareClassKey, &hwid)) {
+ chromeos::system::kHardwareClassKey, &hwid)) {
base::ListValue* hwid_list = NULL;
if (root_->GetList(kHwidMapAttr, &hwid_list)) {
for (size_t i = 0; i < hwid_list->GetSize(); ++i) {
@@ -350,11 +350,11 @@
}
// If manifest doesn't exist still apply values from VPD.
- statistics_provider->GetMachineStatistic(system::kInitialLocaleKey,
+ statistics_provider->GetMachineStatistic(chromeos::system::kInitialLocaleKey,
&initial_locale_);
- statistics_provider->GetMachineStatistic(system::kInitialTimezoneKey,
- &initial_timezone_);
- statistics_provider->GetMachineStatistic(system::kKeyboardLayoutKey,
+ statistics_provider->GetMachineStatistic(
+ chromeos::system::kInitialTimezoneKey, &initial_timezone_);
+ statistics_provider->GetMachineStatistic(chromeos::system::kKeyboardLayoutKey,
&keyboard_layout_);
configured_locales_ = base::SplitString(
initial_locale_, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
@@ -536,7 +536,7 @@
std::string customization_id;
chromeos::system::StatisticsProvider* provider =
chromeos::system::StatisticsProvider::GetInstance();
- if (provider->GetMachineStatistic(system::kCustomizationIdKey,
+ if (provider->GetMachineStatistic(chromeos::system::kCustomizationIdKey,
&customization_id) &&
!customization_id.empty()) {
url_ = GURL(base::StringPrintf(
@@ -775,7 +775,7 @@
std::string locale = g_browser_process->GetApplicationLocale();
std::string name = GetOemAppsFolderNameImpl(locale, root);
if (name.empty())
- name = default_app_order::GetOemAppsFolderName();
+ name = chromeos::default_app_order::GetOemAppsFolderName();
if (!name.empty()) {
app_list::AppListSyncableService* service =
app_list::AppListSyncableServiceFactory::GetForProfile(profile);
@@ -969,4 +969,4 @@
SetApplied(true);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_document.h b/chrome/browser/ash/customization/customization_document.h
index 6b279d91..3a01f43 100644
--- a/chrome/browser/ash/customization/customization_document.h
+++ b/chrome/browser/ash/customization/customization_document.h
@@ -25,31 +25,35 @@
namespace base {
class DictionaryValue;
class FilePath;
-}
-
-namespace extensions {
-class ExternalLoader;
-}
-
-namespace network {
-class SharedURLLoaderFactory;
-class SimpleURLLoader;
-}
-
-namespace user_prefs {
-class PrefRegistrySyncable;
-}
+} // namespace base
namespace chromeos {
-class CustomizationWallpaperDownloader;
-class ServicesCustomizationExternalLoader;
-
+// Friend function to initialize StartupCustomizationDocument for testing.
void InitStartupCustomizationDocumentForTesting(const std::string& manifest);
namespace system {
class StatisticsProvider;
-} // system
+} // namespace system
+} // namespace chromeos
+
+namespace extensions {
+class ExternalLoader;
+} // namespace extensions
+
+namespace network {
+class SharedURLLoaderFactory;
+class SimpleURLLoader;
+} // namespace network
+
+namespace user_prefs {
+class PrefRegistrySyncable;
+} // namespace user_prefs
+
+namespace ash {
+
+class CustomizationWallpaperDownloader;
+class ServicesCustomizationExternalLoader;
// Base class for OEM customization document classes.
class CustomizationDocument {
@@ -109,7 +113,7 @@
FRIEND_TEST_ALL_PREFIXES(StartupCustomizationDocumentTest, BadManifest);
FRIEND_TEST_ALL_PREFIXES(ServicesCustomizationDocumentTest, MultiLanguage);
friend class OobeLocalizationTest;
- friend void InitStartupCustomizationDocumentForTesting(
+ friend void chromeos::InitStartupCustomizationDocumentForTesting(
const std::string& manifest);
friend struct base::DefaultSingletonTraits<StartupCustomizationDocument>;
@@ -117,12 +121,12 @@
StartupCustomizationDocument();
// C-tor for test construction.
- StartupCustomizationDocument(system::StatisticsProvider* provider,
+ StartupCustomizationDocument(chromeos::system::StatisticsProvider* provider,
const std::string& manifest);
~StartupCustomizationDocument() override;
- void Init(system::StatisticsProvider* provider);
+ void Init(chromeos::system::StatisticsProvider* provider);
std::string initial_locale_;
std::vector<std::string> configured_locales_;
@@ -323,6 +327,12 @@
DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when ChromOS code migration is done.
+namespace chromeos {
+using ::ash::ServicesCustomizationDocument;
+using ::ash::StartupCustomizationDocument;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_CUSTOMIZATION_CUSTOMIZATION_DOCUMENT_H_
diff --git a/chrome/browser/ash/customization/customization_document_browsertest.cc b/chrome/browser/ash/customization/customization_document_browsertest.cc
index 3c90a33..dc43dfc 100644
--- a/chrome/browser/ash/customization/customization_document_browsertest.cc
+++ b/chrome/browser/ash/customization/customization_document_browsertest.cc
@@ -22,10 +22,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
-using chromeos::locale_util::SwitchLanguageCallback;
-using chromeos::locale_util::LanguageSwitchResult;
+using ash::locale_util::LanguageSwitchResult;
+using ash::locale_util::SwitchLanguageCallback;
-namespace chromeos {
+namespace ash {
namespace {
@@ -207,15 +207,17 @@
public testing::WithParamInterface<const char*> {
public:
CustomizationVPDTest()
- : statistics_provider_(new system::FakeStatisticsProvider()) {
+ : statistics_provider_(new chromeos::system::FakeStatisticsProvider()) {
// Set the instance returned by GetInstance() for testing.
- system::StatisticsProvider::SetTestProvider(statistics_provider_.get());
+ chromeos::system::StatisticsProvider::SetTestProvider(
+ statistics_provider_.get());
statistics_provider_->SetMachineStatistic("initial_locale", GetParam());
statistics_provider_->SetMachineStatistic("keyboard_layout", "");
}
private:
- std::unique_ptr<system::FakeStatisticsProvider> statistics_provider_;
+ std::unique_ptr<chromeos::system::FakeStatisticsProvider>
+ statistics_provider_;
};
IN_PROC_BROWSER_TEST_P(CustomizationVPDTest, GetUILanguageList) {
@@ -259,4 +261,4 @@
CustomizationVPDTest,
testing::ValuesIn(kVPDInitialLocales));
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_document_unittest.cc b/chrome/browser/ash/customization/customization_document_unittest.cc
index fd6adf0..1966573 100644
--- a/chrome/browser/ash/customization/customization_document_unittest.cc
+++ b/chrome/browser/ash/customization/customization_document_unittest.cc
@@ -110,7 +110,7 @@
} // anonymous namespace
-namespace chromeos {
+namespace ash {
using ::testing::DoAll;
using ::testing::NotNull;
@@ -119,7 +119,7 @@
using ::testing::_;
TEST(StartupCustomizationDocumentTest, Basic) {
- system::ScopedFakeStatisticsProvider fake_statistics_provider;
+ chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider;
// hardware_class selects the appropriate entry in hwid_map in the manifest.
fake_statistics_provider.SetMachineStatistic("hardware_class", "Mario 12345");
@@ -138,7 +138,7 @@
}
TEST(StartupCustomizationDocumentTest, VPD) {
- system::ScopedFakeStatisticsProvider fake_statistics_provider;
+ chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider;
// hardware_class selects the appropriate entry in hwid_map in the manifest.
fake_statistics_provider.SetMachineStatistic("hardware_class", "Mario 12345");
@@ -155,7 +155,7 @@
}
TEST(StartupCustomizationDocumentTest, BadManifest) {
- system::ScopedFakeStatisticsProvider fake_statistics_provider;
+ chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider;
StartupCustomizationDocument customization(&fake_statistics_provider,
kBadManifest);
EXPECT_FALSE(customization.IsReady());
@@ -239,8 +239,8 @@
}
void AddCustomizationIdToVp(const std::string& id) {
- fake_statistics_provider_.SetMachineStatistic(system::kCustomizationIdKey,
- id);
+ fake_statistics_provider_.SetMachineStatistic(
+ chromeos::system::kCustomizationIdKey, id);
}
void AddExpectedManifest(const std::string& id,
@@ -286,7 +286,7 @@
private:
content::BrowserTaskEnvironment task_environment_;
- system::ScopedFakeStatisticsProvider fake_statistics_provider_;
+ chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
ScopedCrosSettingsTestHelper scoped_cros_settings_test_helper_;
TestingPrefServiceSimple local_state_;
network::TestURLLoaderFactory loader_factory_;
@@ -455,4 +455,4 @@
EXPECT_TRUE(doc->IsReady());
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader.cc b/chrome/browser/ash/customization/customization_wallpaper_downloader.cc
index f63d5c4..5cc68e16 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_downloader.cc
+++ b/chrome/browser/ash/customization/customization_wallpaper_downloader.cc
@@ -19,7 +19,7 @@
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
-namespace chromeos {
+namespace ash {
namespace {
// This is temporary file suffix (for downloading or resizing).
const char kTemporarySuffix[] = ".tmp";
@@ -183,4 +183,4 @@
std::move(on_wallpaper_fetch_completed_).Run(*success, wallpaper_url_);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader.h b/chrome/browser/ash/customization/customization_wallpaper_downloader.h
index 1c3fdd7..397ba43 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_downloader.h
+++ b/chrome/browser/ash/customization/customization_wallpaper_downloader.h
@@ -18,7 +18,7 @@
#include "services/network/public/cpp/simple_url_loader.h"
#include "url/gurl.h"
-namespace chromeos {
+namespace ash {
// Download customized wallpaper.
// Owner of this class must provide callback, which will be called on
@@ -107,6 +107,6 @@
DISALLOW_COPY_AND_ASSIGN(CustomizationWallpaperDownloader);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_CUSTOMIZATION_CUSTOMIZATION_WALLPAPER_DOWNLOADER_H_
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
index 51ea53db..44c5106 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
+++ b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
@@ -27,7 +27,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/codec/jpeg_codec.h"
-namespace chromeos {
+namespace ash {
namespace {
@@ -187,8 +187,8 @@
private:
std::unique_ptr<net::test_server::HttpResponse> HandleRequest(
const net::test_server::HttpRequest& request) {
- chromeos::ServicesCustomizationDocument* customization =
- chromeos::ServicesCustomizationDocument::GetInstance();
+ ServicesCustomizationDocument* customization =
+ ServicesCustomizationDocument::GetInstance();
customization->wallpaper_downloader_for_testing()
->set_retry_delay_for_testing(
base::TimeDelta::FromMilliseconds(kDownloadRetryIntervalMS));
@@ -244,8 +244,8 @@
// Start fetching the customized default wallpaper.
GURL url = embedded_test_server()->GetURL(kOEMWallpaperRelativeURL);
- chromeos::ServicesCustomizationDocument* customization =
- chromeos::ServicesCustomizationDocument::GetInstance();
+ ServicesCustomizationDocument* customization =
+ ServicesCustomizationDocument::GetInstance();
EXPECT_TRUE(
customization->LoadManifestFromString(ManifestForURL(url.spec())));
observer.WaitForWallpaperChanged();
@@ -272,8 +272,8 @@
// Start fetching the customized default wallpaper.
GURL url = embedded_test_server()->GetURL(kOEMWallpaperRelativeURL);
- chromeos::ServicesCustomizationDocument* customization =
- chromeos::ServicesCustomizationDocument::GetInstance();
+ ServicesCustomizationDocument* customization =
+ ServicesCustomizationDocument::GetInstance();
EXPECT_TRUE(
customization->LoadManifestFromString(ManifestForURL(url.spec())));
observer.WaitForWallpaperChanged();
@@ -287,4 +287,4 @@
EXPECT_EQ(2U, num_attempts());
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_wallpaper_util.cc b/chrome/browser/ash/customization/customization_wallpaper_util.cc
index 80370df6..487be74 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_util.cc
+++ b/chrome/browser/ash/customization/customization_wallpaper_util.cc
@@ -22,7 +22,7 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "url/gurl.h"
-namespace chromeos {
+namespace ash {
namespace {
@@ -202,4 +202,4 @@
}
} // namespace customization_wallpaper_util
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/customization/customization_wallpaper_util.h b/chrome/browser/ash/customization/customization_wallpaper_util.h
index 5e6fd26..5503221f 100644
--- a/chrome/browser/ash/customization/customization_wallpaper_util.h
+++ b/chrome/browser/ash/customization/customization_wallpaper_util.h
@@ -9,9 +9,9 @@
namespace base {
class FilePath;
-}
+} // namespace base
-namespace chromeos {
+namespace ash {
namespace customization_wallpaper_util {
// First checks if the file paths exist for both large and small sizes, then
@@ -29,6 +29,6 @@
bool ShouldUseCustomizedDefaultWallpaper();
} // namespace customization_wallpaper_util
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_CUSTOMIZATION_CUSTOMIZATION_WALLPAPER_UTIL_H_
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
index 81eeed5..5b932100 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -769,8 +769,8 @@
// OEM pre-installed apps.
int oem_extension_creation_flags =
bundled_extension_creation_flags | Extension::WAS_INSTALLED_BY_OEM;
- chromeos::ServicesCustomizationDocument* customization =
- chromeos::ServicesCustomizationDocument::GetInstance();
+ ash::ServicesCustomizationDocument* customization =
+ ash::ServicesCustomizationDocument::GetInstance();
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service, customization->CreateExternalLoader(profile), profile,
ManifestLocation::kExternalPref,
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ef2ce05..31948ec4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -815,7 +815,7 @@
chromeos::Preferences::RegisterPrefs(registry);
chromeos::ResetScreen::RegisterPrefs(registry);
chromeos::SchedulerConfigurationManager::RegisterLocalStatePrefs(registry);
- chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
+ ash::ServicesCustomizationDocument::RegisterPrefs(registry);
chromeos::SigninScreenHandler::RegisterPrefs(registry);
chromeos::StartupUtils::RegisterPrefs(registry);
ash::StatsReportingController::RegisterLocalStatePrefs(registry);
@@ -1125,7 +1125,7 @@
ash::EduCoexistenceConsentInvalidationController::RegisterProfilePrefs(
registry);
SigninErrorNotifier::RegisterPrefs(registry);
- chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
+ ash::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
chromeos::settings::OSSettingsUI::RegisterProfilePrefs(registry);
chromeos::StartupUtils::RegisterOobeProfilePrefs(registry);
ash::UserImageSyncObserver::RegisterProfilePrefs(registry);
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
index d853fea7..f84dd4b9 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
@@ -160,7 +160,7 @@
void WallpaperControllerClientImpl::SetInitialWallpaper() {
// Apply device customization.
- namespace customization_util = chromeos::customization_wallpaper_util;
+ namespace customization_util = ash::customization_wallpaper_util;
if (customization_util::ShouldUseCustomizedDefaultWallpaper()) {
base::FilePath customized_default_small_path;
base::FilePath customized_default_large_path;
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 70d9e46..5503490c 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -237,8 +237,8 @@
base::ScopedBlockingCall scoped_blocking_call(
FROM_HERE, base::BlockingType::MAY_BLOCK);
- const chromeos::StartupCustomizationDocument* customization =
- chromeos::StartupCustomizationDocument::GetInstance();
+ const ash::StartupCustomizationDocument* customization =
+ ash::StartupCustomizationDocument::GetInstance();
if (!customization->IsReady())
return;
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.h b/chrome/browser/ui/webui/chromeos/login/l10n_util.h
index 8a309d4f..c38f8d1 100644
--- a/chrome/browser/ui/webui/chromeos/login/l10n_util.h
+++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.h
@@ -92,4 +92,11 @@
} // namespace chromeos
+// TODO(https://crbug.com/1164001): remove when ch/br/ui/webui/chromeos is moved
+// to ash.
+namespace ash {
+using ::chromeos::GetUILanguageList;
+using ::chromeos::kMostRelevantLanguagesDivider;
+} // namespace ash
+
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_H_
