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

Unified Diff: ash/shell.cc

Issue 10828007: Create Tooltip object lazily so that it gets proper drop shadow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comment 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 | « no previous file | ash/tooltips/tooltip_controller.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 223438a3b710f9e38c0019c893c0813d2326ad4d..42986da4ecab4118ad814ed37e174d9bc50b5d41 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -453,6 +453,10 @@ void Shell::Init() {
video_detector_.reset(new VideoDetector);
window_cycle_controller_.reset(new WindowCycleController);
+ tooltip_controller_.reset(new internal::TooltipController(
+ drag_drop_controller_.get()));
+ AddEnvEventFilter(tooltip_controller_.get());
+
InitRootWindowController(root_window_controller);
// Initialize Primary RootWindow specific items.
@@ -477,13 +481,6 @@ void Shell::Init() {
shadow_controller_.reset(new internal::ShadowController());
}
- // Tooltip controller must be created after shadow controller so that the
- // tooltip window can be initialized with appropriate shadows.
- tooltip_controller_.reset(new internal::TooltipController(
- drag_drop_controller_.get()));
- AddEnvEventFilter(tooltip_controller_.get());
- aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
-
if (!delegate_.get() || delegate_->IsUserLoggedIn())
CreateLauncher();
@@ -710,6 +707,7 @@ void Shell::InitRootWindowController(
aura::client::SetCaptureClient(root_window, capture_controller_.get());
aura::client::SetScreenPositionClient(root_window,
screen_position_controller_.get());
+ aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
if (nested_dispatcher_controller_.get()) {
aura::client::SetDispatcherClient(root_window,
« no previous file with comments | « no previous file | ash/tooltips/tooltip_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698