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

Unified Diff: ash/shell.cc

Issue 12079002: Minimize black screen during the boot with multi displays (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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/root_window_controller.cc ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 2d39516b9272202ba227df9da0f91bdd362e138f..88b828a2c67f0bbb0eeefa54aee5dc50dbeadf7c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -103,6 +103,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "ash/ash_constants.h"
#include "ash/display/display_change_observer_x11.h"
#include "ash/display/output_configurator_animation.h"
#include "base/chromeos/chromeos_version.h"
@@ -213,7 +214,10 @@ Shell::Shell(ShellDelegate* delegate)
(blacklisted_features & content::GPU_FEATURE_TYPE_PANEL_FITTING) ||
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshDisablePanelFitting);
- output_configurator_->Init(!is_panel_fitting_disabled);
+
+ output_configurator_->Init(
+ !is_panel_fitting_disabled,
+ delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
output_configurator_->AddObserver(output_configurator_animation_.get());
base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow(
« no previous file with comments | « ash/root_window_controller.cc ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698