Allow dynamic enabling/disabling of unified desktop

ash/display/display_manager.h

 // 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.
 
 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 232 matching lines @@
   // Returns the number of connected displays. This returns 2
   // when displays are mirrored.
   size_t num_connected_displays() const { return num_connected_displays_; }
 
   // Returns the mirroring status.
   bool IsInMirrorMode() const;
   int64 mirroring_display_id() const { return mirroring_display_id_; }
   const DisplayList& software_mirroring_display_list() const {
     return software_mirroring_display_list_;
   }
+
+  // Sets/gets if the unified desktop feature is enabled.
+  void SetUnifiedDesktopEnabled(bool enabled);
+  bool unified_desktop_enabled() const { return unified_desktop_enabled_; }
+
+  // Returns true if it's in unified desktop mode.
   bool IsInUnifiedMode() const;
 
   // Returns the display used for software mirrroring. Returns invalid
   // display if not found.
   const gfx::Display GetMirroringDisplayById(int64 id) const;
 
   // Retuns the display info associated with |display_id|.
   const DisplayInfo& GetDisplayInfo(int64 display_id) const;
 
   // Returns the human-readable name for the display |id|.
@@ skipping 12 matching lines @@
   // of on a device.
   void AddRemoveDisplay();
   void ToggleDisplayScaleFactor();
 
   // SoftwareMirroringController override:
 #if defined(OS_CHROMEOS)
   void SetSoftwareMirroring(bool enabled) override;
   bool SoftwareMirroringEnabled() const override;
 #endif
 
-  // Sets/gets multi display mode.
+  // Sets/gets default multi display mode.
+  void SetDefaultMultiDisplayModeForCurrentDisplays(MultiDisplayMode mode);
+  MultiDisplayMode current_default_multi_display_mode() const {
+    return current_default_multi_display_mode_;
+  }
+
+  // Sets multi display mode.
   void SetMultiDisplayMode(MultiDisplayMode mode);
 
-  // Sets/gets default multi display mode.
-  void SetDefaultMultiDisplayMode(MultiDisplayMode mode);
-  MultiDisplayMode default_multi_display_mode() const {
-    return default_multi_display_mode_;
-  }
-
   // Reconfigure display configuration using the same
   // physical display. TODO(oshima): Refactor and move this
   // impl to |SetDefaultMultiDisplayMode|.
   void ReconfigureDisplays();
 
   // Update the bounds of the display given by |display_id|.
   bool UpdateDisplayBounds(int64 display_id,
                            const gfx::Rect& new_bounds);
 
   // Creates mirror window asynchronously if the software mirror mode
@@ skipping 110 matching lines @@
   std::map<int64, DisplayMode> display_modes_;
 
   // When set to true, the host window's resize event updates
   // the display's size. This is set to true when running on
   // desktop environment (for debugging) so that resizing the host
   // window will update the display properly. This is set to false
   // on device as well as during the unit tests.
   bool change_display_upon_host_resize_;
 
   MultiDisplayMode multi_display_mode_;
-  MultiDisplayMode default_multi_display_mode_;
+  MultiDisplayMode current_default_multi_display_mode_;
 
   int64 mirroring_display_id_;
   DisplayList software_mirroring_display_list_;
 
   // User preference for rotation lock of the internal display.
   bool registered_internal_display_rotation_lock_;
 
   // User preference for the rotation of the internal display.
   gfx::Display::Rotation registered_internal_display_rotation_;
 
+  bool unified_desktop_enabled_;
+
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_