Don't create mirror window during bootstrap

BUG=255535
TEST=on lucas, enable mirror mode, then logout, or reboot.

Review URL: https://chromiumcodereview.appspot.com/18218002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209344 0039d316-1c4b-4281-b951-d872f2087c98

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.

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();