summaryrefslogtreecommitdiffstats
path: root/ash/display/display_error_observer_chromeos.cc
diff options
context:
space:
mode:
authordnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 14:50:26 +0000
committerdnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 14:50:26 +0000
commitc9750510710399bf151c24da03f4964acf633cdf (patch)
tree64c2c4b7fb96707f1e9b0af8da9862fa46320256 /ash/display/display_error_observer_chromeos.cc
parent9fc94c6d238a5276365197dbb67b10672b670878 (diff)
downloadchromium_src-c9750510710399bf151c24da03f4964acf633cdf.zip
chromium_src-c9750510710399bf151c24da03f4964acf633cdf.tar.gz
chromium_src-c9750510710399bf151c24da03f4964acf633cdf.tar.bz2
Moving display constants from OutputConfigurator to ui/display
Before defining DisplayMode, DisplaySnapshot, NativeDisplayDelegate, etc. in ui/display and updating OutputConfigurator to use these components, moving all the enums required by these components. BUG=333413 Review URL: https://codereview.chromium.org/154613002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_error_observer_chromeos.cc')
-rw-r--r--ash/display/display_error_observer_chromeos.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/display_error_observer_chromeos.cc b/ash/display/display_error_observer_chromeos.cc
index 5fe543c..a9fcb1a 100644
--- a/ash/display/display_error_observer_chromeos.cc
+++ b/ash/display/display_error_observer_chromeos.cc
@@ -31,13 +31,13 @@ DisplayErrorObserver::~DisplayErrorObserver() {
}
void DisplayErrorObserver::OnDisplayModeChangeFailed(
- chromeos::OutputState new_state) {
+ ui::OutputState new_state) {
// Always remove the notification to make sure the notification appears
// as a popup in any situation.
message_center::MessageCenter::Get()->RemoveNotification(
kDisplayErrorNotificationId, false /* by_user */);
- int message_id = (new_state == chromeos::STATE_DUAL_MIRROR) ?
+ int message_id = (new_state == ui::OUTPUT_STATE_DUAL_MIRROR) ?
IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING :
IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING;