Store rotation/ui scale to local state.

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 378 matching lines @@
         }
       }
       break;
     }
     default:
       CHECK(false);
   }
   return state;
 }
 
-OutputState GetNextState(Display* display,
-                         XRRScreenResources* screen,
-                         OutputState current_state,
-                         const std::vector<OutputSnapshot>& outputs) {
-  TRACE_EVENT0("chromeos", "OutputConfigurator::GetNextState");
-  OutputState state = STATE_INVALID;
-
-  switch (outputs.size()) {
-    case 0:
-      state = STATE_HEADLESS;
-      break;
-    case 1:
-      state = STATE_SINGLE;
-      break;
-    case 2: {
-      bool mirror_supported = (0 != outputs[0].mirror_mode) &&
-          (0 != outputs[1].mirror_mode);
-      switch (current_state) {
-        case STATE_DUAL_EXTENDED:
-          state =
-              mirror_supported ? STATE_DUAL_MIRROR : STATE_DUAL_EXTENDED;
-          break;
-        case STATE_DUAL_MIRROR:
-          state = STATE_DUAL_EXTENDED;
-          break;
-        default:
-          // Default to extended mode.
-          state = STATE_DUAL_EXTENDED;
-      }
-      break;
-    }
-    default:
-      CHECK(false);
-  }
-  return state;
-}
-
 RRCrtc GetNextCrtcAfter(Display* display,
                         XRRScreenResources* screen,
                         RROutput output,
                         RRCrtc previous) {
   RRCrtc crtc = None;
   XRROutputInfo* output_info = XRRGetOutputInfo(display, screen, output);
 
   for (int i = 0; (i < output_info->ncrtc) && (crtc == None); ++i) {
     RRCrtc this_crtc = output_info->crtcs[i];
 
@@ skipping 80 matching lines @@
     XFree(props);
 
   return ret;
 }
 
 }  // namespace
 
 OutputConfigurator::OutputConfigurator()
     // If we aren't running on ChromeOS (like linux desktop),
     // don't try to configure display.
-    : configure_display_(base::chromeos::IsRunningOnChromeOS()),
+    : delegate_(NULL),
+      configure_display_(base::chromeos::IsRunningOnChromeOS()),
       is_panel_fitting_enabled_(false),
       connected_output_count_(0),
       xrandr_event_base_(0),
       output_state_(STATE_INVALID),
       power_state_(DISPLAY_POWER_ALL_ON),
       mirror_mode_will_preserve_aspect_(false),
       mirror_mode_preserved_aspect_(false),
       last_enter_state_time_() {
 }
 
@@ skipping 748 matching lines @@
                                duration);
       break;
     default:
       break;
   }
 
   mirror_mode_preserved_aspect_ = mirror_mode_will_preserve_aspect_;
   last_enter_state_time_ = base::TimeTicks::Now();
 }
 
+OutputState OutputConfigurator::GetNextState(
+    Display* display,
+    XRRScreenResources* screen,
+    OutputState current_state,
+    const std::vector<OutputSnapshot>& output_snapshots) const {
+  TRACE_EVENT0("chromeos", "OutputConfigurator::GetNextState");
+  OutputState state = STATE_INVALID;
+
+  switch (output_snapshots.size()) {
+    case 0:
+      state = STATE_HEADLESS;
+      break;
+    case 1:
+      state = STATE_SINGLE;
+      break;
+    case 2: {
+      bool mirror_supported = (0 != output_snapshots[0].mirror_mode) &&
+          (0 != output_snapshots[1].mirror_mode);
+      switch (current_state) {
+        case STATE_DUAL_EXTENDED:
+          state =
+              mirror_supported ? STATE_DUAL_MIRROR : STATE_DUAL_EXTENDED;
+          break;
+        case STATE_DUAL_MIRROR:
+          state = STATE_DUAL_EXTENDED;
+          break;
+        case STATE_INVALID: {
+          std::vector<RROutput> outputs;
+          for (size_t i = 0; i < output_snapshots.size(); ++i)
+            outputs.push_back(output_snapshots[i].output);
+          state = delegate_->GetStateForOutputs(outputs);
+          break;
+        }
+        default:
+          state = STATE_DUAL_EXTENDED;
+      }
+      break;
+    }
+    default:
+      CHECK(false);
+  }
+  return state;
+}
+
 // static
 bool OutputConfigurator::IsInternalOutput(const XRROutputInfo* output_info) {
   return IsInternalOutputName(std::string(output_info->name));
 }
 
 // static
 RRMode OutputConfigurator::GetOutputNativeMode(
     const XRROutputInfo* output_info) {
   if (output_info->nmode <= 0)
     return None;
 
   return output_info->modes[0];
 }
 
 }  // namespace chromeos