Support transition between chrome and user mode console

ui/display/chromeos/display_configurator.cc

 // Copyright 2014 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 "ui/display/chromeos/display_configurator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 144 matching lines @@
 
     best_mode = mode;
   }
 
   return best_mode;
 }
 
 DisplayConfigurator::DisplayConfigurator()
     : state_controller_(NULL),
       mirroring_controller_(NULL),
+      display_externally_controlled_(false),
       is_panel_fitting_enabled_(false),
       configure_display_(base::SysInfo::IsRunningOnChromeOS()),
       display_state_(MULTIPLE_DISPLAY_STATE_INVALID),
       requested_power_state_(chromeos::DISPLAY_POWER_ALL_ON),
       current_power_state_(chromeos::DISPLAY_POWER_ALL_ON),
-      next_display_protection_client_id_(1) {}
+      next_display_protection_client_id_(1) {
+}
 
 DisplayConfigurator::~DisplayConfigurator() {
   if (native_display_delegate_)
     native_display_delegate_->RemoveObserver(this);
 }
 
 void DisplayConfigurator::SetDelegateForTesting(
     scoped_ptr<NativeDisplayDelegate> display_delegate) {
   DCHECK(!native_display_delegate_);
 
@@ skipping 13 matching lines @@
     return;
 
   // If the delegate is already initialized don't update it (For example, tests
   // set their own delegates).
   if (!native_display_delegate_) {
     native_display_delegate_ = CreatePlatformNativeDisplayDelegate();
     native_display_delegate_->AddObserver(this);
   }
 }
 
+void DisplayConfigurator::RelinquishControl() {
+  // Note: This cannot be enabled yet until a subsequent change
+  // in the native_display_delegate to allow it to relinquish
+  // control of the display.
+  //
+  // native_display_delegate_->RelinquishDisplayControl();

[Daniel Erat, 2014/11/02 13:48:34]

please don't check in commented-out code; just replace this whole commented
section with NOTIMPLEMENTED()

[dsodman, 2014/11/04 05:19:40]

Done.

+  // display_externally_controlled_ = true;
+}
+
 void DisplayConfigurator::ForceInitialConfigure(
     uint32_t background_color_argb) {
   if (!configure_display_)
     return;
 
   native_display_delegate_->GrabServer();
   native_display_delegate_->Initialize();
 
   UpdateCachedDisplays();
   if (cached_displays_.size() > 1 && background_color_argb)
@@ skipping 275 matching lines @@
   if (attempted_change)
     NotifyObservers(success, new_state);
   return success;
 }
 
 bool DisplayConfigurator::SetDisplayMode(MultipleDisplayState new_state) {
   if (!configure_display_)
     return false;
 
   VLOG(1) << "SetDisplayMode: state=" << DisplayStateToString(new_state);
-  if (display_state_ == new_state) {
+  if ((display_state_ == new_state) &&
+      (display_externally_controlled_ == false)) {
     // Cancel software mirroring if the state is moving from
     // MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED to
     // MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED.
     if (mirroring_controller_ &&
         new_state == MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED)
       mirroring_controller_->SetSoftwareMirroring(false);
     NotifyObservers(true, new_state);
     return true;
   }
 
   native_display_delegate_->GrabServer();
+  display_externally_controlled_ = false;
   UpdateCachedDisplays();
   const bool success = EnterStateOrFallBackToSoftwareMirroring(
       new_state, requested_power_state_);
   native_display_delegate_->UngrabServer();
 
   NotifyObservers(success, new_state);
   return success;
 }
 
 void DisplayConfigurator::OnConfigurationChanged() {
@@ skipping 449 matching lines @@
         return state_controller_->GetStateForDisplayIds(display_ids);
       }
     }
     default:
       NOTREACHED();
   }
   return MULTIPLE_DISPLAY_STATE_INVALID;
 }
 
 }  // namespace ui