Introduce DisplayConfigurationController

ash/display/display_manager.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 "ash/display/display_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <string>
@@ skipping 25 matching lines @@
 #include "ui/gfx/font_render_params.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/screen.h"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/display_animator.h"
 #include "base/sys_info.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 typedef std::vector<gfx::Display> DisplayList;
 typedef std::vector<DisplayInfo> DisplayInfoList;
@@ skipping 870 matching lines @@
   return base::StringPrintf("Display %d", static_cast<int>(id));
 }
 
 int64_t DisplayManager::GetDisplayIdForUIScaling() const {
   // UI Scaling is effective on internal display.
   return gfx::Display::HasInternalDisplay() ? gfx::Display::InternalDisplayId()
                                             : gfx::Display::kInvalidDisplayID;
 }
 
 void DisplayManager::SetMirrorMode(bool mirror) {
-#if defined(OS_CHROMEOS)

[oshima, 2016/01/19 18:49:16]

did you have a problem with this on other platforms?

[stevenjb, 2016/01/19 20:32:04]

No, I just wanted to limit the #if defined(OS_CHROMES) to the actual chromeos
specific code. (I don't think this actually gets called on other platforms so we
could probably #ifdef out the entire method, but that would be extra work).

[oshima, 2016/01/19 20:59:30]

We're removing win_ash now, so you don't have to worry about it unless it has a
problem (crbug.com/558054). I'll leave it to you though.

   if (num_connected_displays() <= 1)
     return;
 
+#if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     ui::MultipleDisplayState new_state =
         mirror ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
                : ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
     Shell::GetInstance()->display_configurator()->SetDisplayMode(new_state);
     return;
   }
+#endif
   multi_display_mode_ =
       mirror ? MIRRORING : current_default_multi_display_mode_;
   ReconfigureDisplays();
-  if (Shell::GetInstance()->display_animator()) {
-    Shell::GetInstance()->display_animator()->StartFadeInAnimation();
-  }
-  RunPendingTasksForTest();
-#endif
 }
 
 void DisplayManager::AddRemoveDisplay() {
   DCHECK(!active_display_list_.empty());
   std::vector<DisplayInfo> new_display_info_list;
   const DisplayInfo& first_display =
       IsInUnifiedMode()
           ? GetDisplayInfo(software_mirroring_display_list_[0].id())
           : GetDisplayInfo(active_display_list_[0].id());
   new_display_info_list.push_back(first_display);
@@ skipping 37 matching lines @@
   return software_mirroring_enabled();
 }
 #endif
 
 void DisplayManager::SetDefaultMultiDisplayModeForCurrentDisplays(
     MultiDisplayMode mode) {
   DCHECK_NE(MIRRORING, mode);
   DisplayIdPair pair = GetCurrentDisplayIdPair();
   layout_store_->UpdateMultiDisplayState(pair, IsInMirrorMode(),
                                          mode == UNIFIED);
+  ReconfigureDisplays();
 }
 
 void DisplayManager::SetMultiDisplayMode(MultiDisplayMode mode) {
   multi_display_mode_ = mode;
   mirroring_display_id_ = gfx::Display::kInvalidDisplayID;
   software_mirroring_display_list_.clear();
 }
 
 void DisplayManager::ReconfigureDisplays() {
   DisplayInfoList display_info_list;
@@ skipping 387 matching lines @@
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 void DisplayManager::RunPendingTasksForTest() {
   if (!software_mirroring_display_list_.empty())
     base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace ash