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

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: rebase 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
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/ui/webui/options2/chromeos/display_options_handler.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 1ab4c6a3ce8a65b61241cd778c975df710dc0680..2e55736b903a3985b311134fa9362708403d9e08 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)
@@ -182,6 +183,8 @@ Shell::Shell(ShellDelegate* delegate)
#if defined(OS_CHROMEOS)
output_configurator_(new chromeos::OutputConfigurator(
internal::DisplayController::IsExtendedDesktopEnabled())),
+ output_configurator_animation_(
+ new internal::OutputConfiguratorAnimation()),
#endif // defined(OS_CHROMEOS)
shelf_(NULL),
panel_layout_manager_(NULL),
@@ -190,7 +193,7 @@ Shell::Shell(ShellDelegate* delegate)
gfx::Screen::SetInstance(screen_);
ui_controls::InstallUIControlsAura(internal::CreateUIControls());
#if defined(OS_CHROMEOS)
- // OutputConfigurator needs to get events regarding added/removed outputs.
+ output_configurator_->AddObserver(output_configurator_animation_.get());
static_cast<aura::DispatcherLinux*>(
aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow(
output_configurator());
@@ -272,6 +275,7 @@ Shell::~Shell() {
instance_ = NULL;
#if defined(OS_CHROMEOS)
+ output_configurator_->RemoveObserver(output_configurator_animation_.get());
// Remove OutputConfigurator from Dispatcher.
static_cast<aura::DispatcherLinux*>(
aura::Env::GetInstance()->GetDispatcher())->RemoveDispatcherForRootWindow(
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/ui/webui/options2/chromeos/display_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698