Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2794)

Unified Diff: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index 67a4f611f09b091e6a9a31fc4fdd35c0faaae577..bb94fc92e3d38026028175e44615fa523638c5bd 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -80,21 +80,21 @@ int64_t GetDisplayIdFromDictionary(const base::DictionaryValue* dictionary,
return GetDisplayIdFromValue(arg);
}
-base::string16 GetColorProfileName(ui::ColorCalibrationProfile profile) {
+base::string16 GetColorProfileName(display::ColorCalibrationProfile profile) {
switch (profile) {
- case ui::COLOR_PROFILE_STANDARD:
+ case display::COLOR_PROFILE_STANDARD:
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_STANDARD);
- case ui::COLOR_PROFILE_DYNAMIC:
+ case display::COLOR_PROFILE_DYNAMIC:
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_DYNAMIC);
- case ui::COLOR_PROFILE_MOVIE:
+ case display::COLOR_PROFILE_MOVIE:
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_MOVIE);
- case ui::COLOR_PROFILE_READING:
+ case display::COLOR_PROFILE_READING:
return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_READING);
- case ui::NUM_COLOR_PROFILES:
+ case display::NUM_COLOR_PROFILES:
break;
}
@@ -558,8 +558,8 @@ void DisplayOptionsHandler::HandleSetColorProfile(const base::ListValue* args) {
return;
}
- if (profile_id < ui::COLOR_PROFILE_STANDARD ||
- profile_id > ui::COLOR_PROFILE_READING) {
+ if (profile_id < display::COLOR_PROFILE_STANDARD ||
+ profile_id > display::COLOR_PROFILE_READING) {
LOG(ERROR) << "Invalid profile_id: " << profile_id;
return;
}
@@ -567,7 +567,7 @@ void DisplayOptionsHandler::HandleSetColorProfile(const base::ListValue* args) {
content::RecordAction(
base::UserMetricsAction("Options_DisplaySetColorProfile"));
GetDisplayManager()->SetColorCalibrationProfile(
- display_id, static_cast<ui::ColorCalibrationProfile>(profile_id));
+ display_id, static_cast<display::ColorCalibrationProfile>(profile_id));
SendAllDisplayInfo();
}

Powered by Google App Engine
This is Rietveld 408576698