Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Unified Diff: ash/display/mirror_window_controller.cc

Issue 18218002: Don't create mirror window during bootstrap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 4f750fe0efc62a35a7d8d3877e3ac0478aacd3ce..a2b9d09f39893a56e1a56230172f07ae1e13568e 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();
« no previous file with comments | « ash/display/display_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698