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

Unified Diff: ash/shell.cc

Issue 10817028: Add Fade-out/Fade-in animation during output-configuration change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index ef6557a6ed77ce77f83a0a7b65151c08f9208493..60036b0d787486519653750387817c70406a312a 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -99,6 +99,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "ash/display/output_configurator_animation.h"
#include "chromeos/display/output_configurator.h"
#include "ui/aura/dispatcher_linux.h"
#endif // defined(OS_CHROMEOS)
@@ -190,6 +191,8 @@ Shell::Shell(ShellDelegate* delegate)
ui_controls::InstallUIControlsAura(internal::CreateUIControls());
#if defined(OS_CHROMEOS)
// OutputConfigurator needs to get events regarding added/removed outputs.
+ output_configurator_->set_animation_delegate(
+ new internal::OutputConfiguratorAnimation);
static_cast<aura::DispatcherLinux*>(
aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow(
output_configurator());

Powered by Google App Engine
This is Rietveld 408576698