Change namespace to ash for //ash/components/settings
Codes in //ash/components/settings are a part of the ash-chrome, so
namespace is changed to ash.
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.
Change-Id: I04d46db6fc658f859c527ad337b0c1df6d8eb0ce
Bug: 1164001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3260132
Commit-Queue: Yeunjoo Choi <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/main@{#940155}
diff --git a/chrome/browser/ui/app_list/app_service/app_service_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/app_service/app_service_app_model_builder_unittest.cc
index 7746328..a98260d 100644
--- a/chrome/browser/ui/app_list/app_service/app_service_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/app_service/app_service_app_model_builder_unittest.cc
@@ -1031,7 +1031,7 @@
GetModelContent(model_updater_.get()));
testing_profile_->ScopedCrosSettingsTestHelper()->SetBoolean(
- chromeos::kPluginVmAllowed, false);
+ ash::kPluginVmAllowed, false);
app_service_test_.FlushMojoCalls();
EXPECT_THAT(GetModelContent(model_updater_.get()), testing::IsEmpty());
diff --git a/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc b/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
index adf93c4..2a70c2c 100644
--- a/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
@@ -167,7 +167,7 @@
public:
SystemTrayClientClockUnknownPrefTest() {
scoped_testing_cros_settings_.device_settings()->SetBoolean(
- chromeos::kSystemUse24HourClock, true);
+ ash::kSystemUse24HourClock, true);
}
// ash::localStateMixin::Delegate:
void SetUpLocalState() override {
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
index ec43b9a..7e84bc2 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
@@ -213,7 +213,7 @@
local_state_ = g_browser_process->local_state();
show_user_names_on_signin_subscription_ =
ash::CrosSettings::Get()->AddSettingsObserver(
- chromeos::kAccountsPrefShowUserNamesOnSignIn,
+ ash::kAccountsPrefShowUserNamesOnSignIn,
base::BindRepeating(
&WallpaperControllerClientImpl::ShowWallpaperOnLoginScreen,
weak_factory_.GetWeakPtr()));
@@ -697,8 +697,8 @@
bool WallpaperControllerClientImpl::ShouldShowUserNamesOnLogin() const {
bool show_user_names = true;
- ash::CrosSettings::Get()->GetBoolean(
- chromeos::kAccountsPrefShowUserNamesOnSignIn, &show_user_names);
+ ash::CrosSettings::Get()->GetBoolean(ash::kAccountsPrefShowUserNamesOnSignIn,
+ &show_user_names);
return show_user_names;
}
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 a29de73f..961719e5 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
@@ -168,8 +168,8 @@
browser()->profile()->GetPrefs()->SetBoolean(
plugin_vm::prefs::kPluginVmAllowed, true);
// Device policies.
- scoped_testing_cros_settings_.device_settings()->Set(
- chromeos::kPluginVmAllowed, base::Value(true));
+ scoped_testing_cros_settings_.device_settings()->Set(ash::kPluginVmAllowed,
+ base::Value(true));
}
void SetUserWithAffiliation() {
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc
index 1d369ae..db53bb3 100644
--- a/chrome/browser/ui/webui/flags/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -79,7 +79,7 @@
base::SysInfo::IsRunningOnChromeOS()) {
// Set the string to show which user can actually change the flags.
std::string owner;
- ash::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+ ash::CrosSettings::Get()->GetString(ash::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 9daf69bf..81003fd 100644
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -28,7 +28,7 @@
return default_update_over_cellular_allowed;
const base::Value* types_value =
- settings->GetPref(chromeos::kAllowedConnectionTypesForUpdate);
+ settings->GetPref(ash::kAllowedConnectionTypesForUpdate);
if (!types_value)
return default_update_over_cellular_allowed;
CHECK(types_value->is_list());
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 2fc555af..5cedeae 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -69,7 +69,7 @@
if (!settings)
return update_disabled;
const base::Value* update_disabled_value =
- settings->GetPref(chromeos::kUpdateDisabled);
+ settings->GetPref(ash::kUpdateDisabled);
if (update_disabled_value) {
CHECK(update_disabled_value->is_bool());
update_disabled = update_disabled_value->GetBool();
@@ -189,7 +189,7 @@
: nullptr;
// For local owner set the field in the policy blob.
if (service)
- service->SetString(chromeos::kReleaseChannel, channel);
+ service->SetString(ash::kReleaseChannel, channel);
DBusThreadManager::Get()->GetUpdateEngineClient()->
SetChannel(channel, is_powerwash_allowed);
}
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
index 4b7dc4a..77cca35e 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -578,7 +578,7 @@
}
bool report_print_jobs = false;
- chromeos::CrosSettings::Get()->GetBoolean(chromeos::kReportDevicePrintJobs,
+ chromeos::CrosSettings::Get()->GetBoolean(ash::kReportDevicePrintJobs,
&report_print_jobs);
if (report_print_jobs) {
AddDeviceReportingElement(report_sources, kManagementReportPrintJobs,
@@ -624,7 +624,7 @@
}
bool report_login_logout = false;
- chromeos::CrosSettings::Get()->GetBoolean(chromeos::kReportDeviceLoginLogout,
+ chromeos::CrosSettings::Get()->GetBoolean(ash::kReportDeviceLoginLogout,
&report_login_logout);
if (report_login_logout) {
AddDeviceReportingElement(report_sources, kManagementReportLoginLogout,
@@ -653,7 +653,7 @@
base::UTF8ToUTF16(GetDeviceManager()),
ui::GetChromeOSDeviceName()));
std::string eol_admin_message;
- ash::CrosSettings::Get()->GetString(chromeos::kDeviceMinimumVersionAueMessage,
+ ash::CrosSettings::Get()->GetString(ash::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 34690cf..0d02885 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -446,8 +446,8 @@
GetTestConfig().report_users, GetTestConfig().report_crash_info,
GetTestConfig().report_app_info_and_activity);
settings_.device_settings()->SetTrustedStatus(
- chromeos::CrosSettingsProvider::TRUSTED);
- settings_.device_settings()->SetBoolean(chromeos::kSystemLogUploadEnabled,
+ ash::CrosSettingsProvider::TRUSTED);
+ settings_.device_settings()->SetBoolean(ash::kSystemLogUploadEnabled,
GetTestConfig().upload_enabled);
profile_->GetPrefs()->SetBoolean(
prefs::kPrintingSendUsernameAndFilenameEnabled,
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 6908e13d..aeb807c 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -123,8 +123,7 @@
bool value = false;
// On a managed machine we delegate this setting to the affiliated users
// only if the policy value is true.
- ash::CrosSettings::Get()->GetBoolean(chromeos::kReleaseChannelDelegated,
- &value);
+ ash::CrosSettings::Get()->GetBoolean(ash::kReleaseChannelDelegated, &value);
if (!value)
return false;
@@ -557,7 +556,7 @@
// its value.
std::string value;
bool is_lts =
- ash::CrosSettings::Get()->GetString(chromeos::kReleaseLtsTag, &value);
+ ash::CrosSettings::Get()->GetString(ash::kReleaseLtsTag, &value);
channel_info->SetBoolean("isLts", is_lts);
ResolveJavascriptCallback(base::Value(callback_id), *channel_info);
