diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 17:34:26 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 17:34:26 +0000 |
| commit | 09527a7a7daae98d4e1ff13e9adc5a6e75f56b57 (patch) | |
| tree | 86c96e2ce529b28778fd57ac19cc04d47f8e509c /ash/shell.cc | |
| parent | aad45bc86160c612258535890f652c818bc2d823 (diff) | |
| download | chromium_src-09527a7a7daae98d4e1ff13e9adc5a6e75f56b57.zip chromium_src-09527a7a7daae98d4e1ff13e9adc5a6e75f56b57.tar.gz chromium_src-09527a7a7daae98d4e1ff13e9adc5a6e75f56b57.tar.bz2 | |
ash: Fix order of creation of tooltip controller and shadow controller. This
was regressed in https://chromiumcodereview.appspot.com/10546024/
BUG=132863
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10548060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index f889182..c571527 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -409,13 +409,10 @@ void Shell::Init() { stacking_controller_.reset(new internal::StackingController); visibility_controller_.reset(new internal::VisibilityController); drag_drop_controller_.reset(new internal::DragDropController); - tooltip_controller_.reset(new internal::TooltipController( - drag_drop_controller_.get())); if (delegate_.get()) user_action_client_.reset(delegate_->CreateUserActionClient()); window_modality_controller_.reset(new internal::WindowModalityController); AddEnvEventFilter(window_modality_controller_.get()); - AddEnvEventFilter(tooltip_controller_.get()); magnification_controller_.reset(new internal::MagnificationController); high_contrast_controller_.reset(new HighContrastController); @@ -446,6 +443,13 @@ 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(); @@ -659,7 +663,6 @@ void Shell::InitRootWindowController( aura::client::SetActivationClient(root_window, activation_controller_.get()); aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); - aura::client::SetTooltipClient(root_window, tooltip_controller_.get()); aura::client::SetCaptureClient(root_window, capture_controller_.get()); if (nested_dispatcher_controller_.get()) { |