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

Unified Diff: ash/shell.cc

Issue 12505005: Store rotation/ui scale to local state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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_manager.cc ('k') | ash/shell/shell_delegate_impl.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 27223e1e1425143aeb58f3d049c680e73977fb70..d762132e3bc227a0d5cf4f0dee3c3f8f48eed398 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -417,6 +417,7 @@ bool Shell::IsLauncherPerDisplayEnabled() {
}
void Shell::Init() {
+ delegate_->OnPreInit();
#if defined(OS_CHROMEOS)
output_configurator_animation_.reset(
new internal::OutputConfiguratorAnimation());
@@ -427,6 +428,7 @@ void Shell::Init() {
// observer gets invoked after the root windows are configured.
output_configurator_->AddObserver(display_change_observer_.get());
display_error_observer_.reset(new internal::DisplayErrorObserver());
+ output_configurator_->set_delegate(display_change_observer_.get());
output_configurator_->AddObserver(display_error_observer_.get());
display_change_observer_->OnDisplayModeChanged();
}
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698