diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 21:05:27 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 21:05:27 +0000 |
| commit | 045af40b931762bae677c5a5ec5868cf912c24ac (patch) | |
| tree | 5150787540eb82777728ff583c936c7e860f1bcd /ash/display/mirror_window_controller.cc | |
| parent | 07cfed2b79923c1e360797b739de0cb95da04e5b (diff) | |
| download | chromium_src-045af40b931762bae677c5a5ec5868cf912c24ac.zip chromium_src-045af40b931762bae677c5a5ec5868cf912c24ac.tar.gz chromium_src-045af40b931762bae677c5a5ec5868cf912c24ac.tar.bz2 | |
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
Diffstat (limited to 'ash/display/mirror_window_controller.cc')
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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(); |