Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / display / display_error_observer_chromeos.cc

diff --git a/src/ash/display/display_error_observer_chromeos.cc b/src/ash/display/display_error_observer_chromeos.cc
index a9fcb1a..145bbc0 100644 (file)
--- a/src/ash/display/display_error_observer_chromeos.cc
+++ b/src/ash/display/display_error_observer_chromeos.cc
@@ -17,7 +17,6 @@
 using message_center::Notification;
 
 namespace ash {
-namespace internal {
 namespace {
 
 const char kDisplayErrorNotificationId[] = "chrome://settings/display/error";
@@ -31,13 +30,13 @@ DisplayErrorObserver::~DisplayErrorObserver() {
 }
 
 void DisplayErrorObserver::OnDisplayModeChangeFailed(
-    ui::OutputState new_state) {
+    ui::MultipleDisplayState 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 == ui::OUTPUT_STATE_DUAL_MIRROR) ?
+  int message_id = (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) ?
       IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING :
       IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING;
 
@@ -70,5 +69,4 @@ base::string16 DisplayErrorObserver::
   return base::string16();
 }
 
-}  // namespace internal
 }  // namespace ash