Change namespace chromeos => ash for //c/b/ash/settings
Code in //chrome/browser/ash/settings 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: I6a1cf768b81534c61a223ad7b0e5c5854d867573
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2727220
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#861876}
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
index bf9a96f5..7beefb2 100644
--- a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
@@ -293,8 +293,8 @@
};
void MultiProfileSupportTest::SetUp() {
- chromeos::DeviceSettingsService::Initialize();
- chromeos::CrosSettings::Initialize(
+ ash::DeviceSettingsService::Initialize();
+ ash::CrosSettings::Initialize(
TestingBrowserProcess::GetGlobal()->local_state());
ChromeAshTestBase::SetUp(std::make_unique<TestShellDelegateChromeOS>());
ash_test_helper()
@@ -367,8 +367,8 @@
ChromeAshTestBase::TearDown();
wallpaper_controller_client_.reset();
profile_manager_.reset();
- chromeos::CrosSettings::Shutdown();
- chromeos::DeviceSettingsService::Shutdown();
+ ash::CrosSettings::Shutdown();
+ ash::DeviceSettingsService::Shutdown();
}
std::string MultiProfileSupportTest::GetStatusImpl(bool follow_transients) {
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc
index ab533b8..e431b2a 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl.cc
@@ -157,9 +157,8 @@
prefs::kSessionLengthLimit,
base::BindRepeating(&SessionControllerClientImpl::SendSessionLengthLimit,
base::Unretained(this)));
- chromeos::DeviceSettingsService::Get()
- ->device_off_hours_controller()
- ->AddObserver(this);
+ ash::DeviceSettingsService::Get()->device_off_hours_controller()->AddObserver(
+ this);
DCHECK(!g_session_controller_client_instance);
g_session_controller_client_instance = this;
}
@@ -180,7 +179,7 @@
SessionManager::Get()->RemoveObserver(this);
UserManager::Get()->RemoveObserver(this);
UserManager::Get()->RemoveSessionStateObserver(this);
- chromeos::DeviceSettingsService::Get()
+ ash::DeviceSettingsService::Get()
->device_off_hours_controller()
->RemoveObserver(this);
}
@@ -602,7 +601,7 @@
}
policy::off_hours::DeviceOffHoursController* off_hours_controller =
- chromeos::DeviceSettingsService::Get()->device_off_hours_controller();
+ ash::DeviceSettingsService::Get()->device_off_hours_controller();
base::Time off_hours_session_end_time;
// Use "OffHours" end time only if the session will be actually terminated.
if (off_hours_controller->IsCurrentSessionAllowedOnlyForOffHours())
diff --git a/chrome/browser/ui/ash/system_tray_client_browsertest.cc b/chrome/browser/ui/ash/system_tray_client_browsertest.cc
index cb20eea..dbdd4d3 100644
--- a/chrome/browser/ui/ash/system_tray_client_browsertest.cc
+++ b/chrome/browser/ui/ash/system_tray_client_browsertest.cc
@@ -180,7 +180,7 @@
}
protected:
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::LocalStateMixin local_state_{&mixin_host_, this};
};
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client.cc b/chrome/browser/ui/ash/wallpaper_controller_client.cc
index 65405df60..69335d50 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client.cc
@@ -121,7 +121,7 @@
WallpaperControllerClient::WallpaperControllerClient() {
local_state_ = g_browser_process->local_state();
show_user_names_on_signin_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kAccountsPrefShowUserNamesOnSignIn,
base::BindRepeating(
&WallpaperControllerClient::ShowWallpaperOnLoginScreen,
@@ -522,7 +522,7 @@
bool WallpaperControllerClient::ShouldShowUserNamesOnLogin() const {
bool show_user_names = true;
- chromeos::CrosSettings::Get()->GetBoolean(
+ ash::CrosSettings::Get()->GetBoolean(
chromeos::kAccountsPrefShowUserNamesOnSignIn, &show_user_names);
return show_user_names;
}
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc b/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc
index f3c212e..86239f1 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc
@@ -21,7 +21,7 @@
private:
ScopedTestingLocalState local_state_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(WallpaperControllerClientTest);
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 1faad1a..94174af 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -181,7 +181,7 @@
BookmarkModel* model_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
};
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
index d4ad7ab..6f6d2e7 100644
--- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
+++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
@@ -142,7 +142,7 @@
IDS_PLUGIN_VM_INSTALLER_FINISHED_TITLE));
}
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
std::unique_ptr<network::TestNetworkConnectionTracker>
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc
index 17b4eba..75d4266 100644
--- a/chrome/browser/ui/webui/flags/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -78,7 +78,7 @@
base::SysInfo::IsRunningOnChromeOS()) {
// Set the string to show which user can actually change the flags.
std::string owner;
- chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+ ash::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
source->AddString("owner-warning",
l10n_util::GetStringFUTF16(IDS_FLAGS_UI_OWNER_WARNING,
base::UTF8ToUTF16(owner)));
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
index cfddc57..b2a4f3ca 100644
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -23,7 +23,7 @@
interactive ? true : chromeos::switches::IsCellularFirstDevice();
// Device Policy overrides the defaults.
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
if (!settings)
return default_update_over_cellular_allowed;
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 1fe22853..dba49c73 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -67,7 +67,7 @@
// Returns true if auto-update is disabled by the system administrator.
bool IsAutoUpdateDisabled() {
bool update_disabled = kDefaultAutoUpdateDisabled;
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
if (!settings)
return update_disabled;
const base::Value* update_disabled_value =
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
index f812f8e..e580230 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -638,8 +638,8 @@
base::UTF8ToUTF16(GetDeviceManager()),
ui::GetChromeOSDeviceName()));
std::string eol_admin_message;
- chromeos::CrosSettings::Get()->GetString(
- chromeos::kDeviceMinimumVersionAueMessage, &eol_admin_message);
+ ash::CrosSettings::Get()->GetString(chromeos::kDeviceMinimumVersionAueMessage,
+ &eol_admin_message);
response->SetStringPath("eolAdminMessage", eol_admin_message);
}
diff --git a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
index dc2f507..4d8d02a 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -556,7 +556,7 @@
std::unique_ptr<TestDeviceCloudPolicyManagerChromeOS> manager_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
policy::ServerBackedStateKeysBroker state_keys_broker_;
- chromeos::ScopedTestingCrosSettings settings_;
+ ash::ScopedTestingCrosSettings settings_;
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
#else
content::BrowserTaskEnvironment task_environment_;
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
index ab1750f..f6a9ba3b 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -236,7 +236,7 @@
void GetOffHoursStatus(base::DictionaryValue* dict) {
policy::off_hours::DeviceOffHoursController* off_hours_controller =
- chromeos::DeviceSettingsService::Get()->device_off_hours_controller();
+ ash::DeviceSettingsService::Get()->device_off_hours_controller();
if (off_hours_controller) {
dict->SetBoolean("isOffHoursActive",
off_hours_controller->is_off_hours_mode());
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 09b82022..c6d253e 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -123,8 +123,8 @@
bool value = false;
// On a managed machine we delegate this setting to the affiliated users
// only if the policy value is true.
- chromeos::CrosSettings::Get()->GetBoolean(
- chromeos::kReleaseChannelDelegated, &value);
+ ash::CrosSettings::Get()->GetBoolean(chromeos::kReleaseChannelDelegated,
+ &value);
if (!value)
return false;
@@ -551,8 +551,8 @@
// For the LTS pilot simply check whether the device policy is set and ignore
// its value.
std::string value;
- bool is_lts = chromeos::CrosSettings::Get()->GetString(
- chromeos::kReleaseLtsTag, &value);
+ bool is_lts =
+ ash::CrosSettings::Get()->GetString(chromeos::kReleaseLtsTag, &value);
channel_info->SetBoolean("isLts", is_lts);
ResolveJavascriptCallback(base::Value(callback_id), *channel_info);
