diff options
| -rw-r--r-- | ash/display/display_controller.h | 2 | ||||
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h index 7ef1385..b1cdd08 100644 --- a/ash/display/display_controller.h +++ b/ash/display/display_controller.h @@ -38,6 +38,7 @@ namespace ash { namespace internal { class DisplayManager; class FocusActivationStore; +class MirrorWindowController; class RootWindowController; } @@ -165,6 +166,7 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver { private: friend class internal::DisplayManager; + friend class internal::MirrorWindowController; // Creates a root window for |display| and stores it in the |root_windows_| // map. diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 4f750fe..a2b9d09 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -11,6 +11,7 @@ #undef RootWindow #endif +#include "ash/display/display_controller.h" #include "ash/display/display_info.h" #include "ash/display/display_manager.h" #include "ash/display/root_window_transformers.h" @@ -155,6 +156,9 @@ MirrorWindowController::~MirrorWindowController() { } void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) { + if (Shell::GetInstance()->display_controller()->in_bootstrap()) + return; + static int mirror_root_window_count = 0; DisplayManager* display_manager = Shell::GetInstance()->display_manager(); |