Use OutputConfigurator::SetDislpayMode for ctrl-fullscreen

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 604 matching lines @@
   XUngrabServer(display);
 
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       SetIsProjecting(is_projecting);
 }
 
 void OutputConfigurator::Stop() {
   configure_display_ = false;
 }
 
-bool OutputConfigurator::CycleDisplayMode() {
-  TRACE_EVENT0("chromeos", "OutputConfigurator::CycleDisplayMode");
-  VLOG(1) << "CycleDisplayMode";
-  if (!configure_display_)
-    return false;
-
-  bool did_change = false;
-  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);
-  connected_output_count_ = outputs.size();
-  OutputState original = InferCurrentState(display, screen, outputs);
-  OutputState next_state = GetNextState(display, screen, original, outputs);
-  if (original != next_state &&
-      EnterState(display, screen, window, next_state, power_state_, outputs)) {
-    did_change = true;
-  }
-  // We have seen cases where the XRandR data can get out of sync with our own
-  // 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(next_state));
-  }
-  return did_change;
-}
-
 bool OutputConfigurator::SetDisplayPower(DisplayPowerState power_state,
                                          bool force_probe) {
   TRACE_EVENT0("chromeos", "OutputConfigurator::SetDisplayPower");
   VLOG(1) << "OutputConfigurator::SetDisplayPower: power_state=" << power_state
           << " force_probe=" << force_probe;
 
   if (!configure_display_)
     return false;
   if (power_state == power_state_ && !force_probe)
     return true;
@@ skipping 675 matching lines @@
 // static
 RRMode OutputConfigurator::GetOutputNativeMode(
     const XRROutputInfo* output_info) {
   if (output_info->nmode <= 0)
     return None;
 
   return output_info->modes[0];
 }
 
 }  // namespace chromeos