Provides more types of errors for output status.

chromeos/display/output_configurator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/display/output_configurator.h"
 
 #include <cmath>
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
@@ skipping 631 matching lines @@
   // cache so over-write it with whatever we detected, even if we didn't think
   // anything changed.
   output_state_ = next_state;
 
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
 
   if (did_change)
     NotifyOnDisplayChanged();
   else
-    FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChangeFailed());
+    FOR_EACH_OBSERVER(
+        Observer, observers_, OnDisplayModeChangeFailed(next_state));
   return did_change;
 }
 
 bool OutputConfigurator::ScreenPowerSet(bool power_on, bool all_displays) {
   TRACE_EVENT0("chromeos", "OutputConfigurator::ScreenPowerSet");
   VLOG(1) << "OutputConfigurator::SetScreensOn " << power_on
           << " all displays " << all_displays;
   if (!is_running_on_chrome_os_)
     return false;
 
@@ skipping 84 matching lines @@
   connected_output_count_ = outputs.size();
   if (EnterState(display, screen, window, new_state, outputs))
     output_state_ = new_state;
 
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
 
   if (output_state_ == new_state)
     NotifyOnDisplayChanged();
   else
-    FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChangeFailed());
+    FOR_EACH_OBSERVER(
+        Observer, observers_, OnDisplayModeChangeFailed(new_state));
   return true;
 }
 
 bool OutputConfigurator::Dispatch(const base::NativeEvent& event) {
   TRACE_EVENT0("chromeos", "OutputConfigurator::Dispatch");
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify)
     XRRUpdateConfiguration(event);
   // Ignore this event if the Xrandr extension isn't supported.
   if (!is_running_on_chrome_os_ ||
       (event->type - xrandr_event_base_ != RRNotify)) {
@@ skipping 34 matching lines @@
   Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay();
   CHECK(display != NULL);
   XGrabServer(display);
   Window window = DefaultRootWindow(display);
   XRRScreenResources* screen = GetScreenResourcesAndRecordUMA(display, window);
   CHECK(screen != NULL);
 
   std::vector<OutputSnapshot> outputs = GetDualOutputs(display, screen);
   int new_output_count = outputs.size();
   bool changed = false;
   if (new_output_count != connected_output_count_) {

[oshima, 2013/02/14 00:01:50]

Not your fault, but this is wrong. This can cause the error
if you swap the display during the suspend...

[Jun Mukai, 2013/02/14 00:54:03]

okay, so I'll wait.

     connected_output_count_ = new_output_count;
     OutputState new_state =
         GetNextState(display, screen, STATE_INVALID, outputs);
     changed = EnterState(display, screen, window, new_state, outputs);
     if (changed)
       output_state_ = new_state;
+    else
+      FOR_EACH_OBSERVER(
+          Observer, observers_, OnDisplayModeChangeFailed(new_state));

[oshima, 2013/02/14 00:01:50]

I think we need to move this out from xgrab section,
but let me fix the above issue first.

[Jun Mukai, 2013/02/14 00:54:03]

I have little ideas what you're talking. Can I leave this as is for now?

   }
   bool is_projecting = IsProjecting(outputs);
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
 
   if (changed)
     NotifyOnDisplayChanged();
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       SetIsProjecting(is_projecting);
 }
@@ skipping 512 matching lines @@
 // static
 RRMode OutputConfigurator::GetOutputNativeMode(
     const XRROutputInfo* output_info) {
   if (output_info->nmode <= 0)
     return None;
 
   return output_info->modes[0];
 }
 
 }  // namespace chromeos