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

Unified Diff: ash/display/display_error_observer_chromeos.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: ash/display/display_error_observer_chromeos.cc
diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc
index f50f1ec167bbef3c81e54d2ae1b30a59e7527837..e90071a67564bcc2593c7956986e49b17e1142bc 100644
--- a/ash/display/display_error_observer_chromeos.cc
+++ b/ash/display/display_error_observer_chromeos.cc
@@ -17,8 +17,8 @@ DisplayErrorObserver::DisplayErrorObserver() {}
DisplayErrorObserver::~DisplayErrorObserver() {}
void DisplayErrorObserver::OnDisplayModeChangeFailed(
- const ui::DisplayConfigurator::DisplayStateList& displays,
- ui::MultipleDisplayState new_state) {
+ const display::DisplayConfigurator::DisplayStateList& displays,
+ display::MultipleDisplayState new_state) {
LOG(ERROR) << "Failed to configure the following display(s):";
for (auto* display : displays) {
LOG(ERROR) << "- Display with ID = " << display->display_id()
@@ -28,7 +28,7 @@ void DisplayErrorObserver::OnDisplayModeChangeFailed(
}
base::string16 message =
- (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR)
+ (new_state == display::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR)
? l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING)
: ash::SubstituteChromeOSDeviceType(
IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING);
« no previous file with comments | « ash/display/display_error_observer_chromeos.h ('k') | ash/display/display_error_observer_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698