diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-05 05:09:41 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-05 05:09:41 +0000 |
| commit | d7f30a70e355f0d8c77020550226f076e2c01fcd (patch) | |
| tree | 60179e2c75a774882cde0fc1ce6a89006c0c1e9a /ash | |
| parent | 5b9e9bc7fe2e4721ddb466db8829ce3015c56f1a (diff) | |
| download | chromium_src-d7f30a70e355f0d8c77020550226f076e2c01fcd.zip chromium_src-d7f30a70e355f0d8c77020550226f076e2c01fcd.tar.gz chromium_src-d7f30a70e355f0d8c77020550226f076e2c01fcd.tar.bz2 | |
Wires up aura to using native tooltips on windows non-metro
BUG=292738
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/25415007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index cc6442a..4f21264 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -100,6 +100,7 @@ #include "ui/views/corewm/focus_controller.h" #include "ui/views/corewm/input_method_event_filter.h" #include "ui/views/corewm/shadow_controller.h" +#include "ui/views/corewm/tooltip_aura.h" #include "ui/views/corewm/tooltip_controller.h" #include "ui/views/corewm/visibility_controller.h" #include "ui/views/corewm/window_modality_controller.h" @@ -811,8 +812,10 @@ void Shell::Init() { window_cycle_controller_.reset(new WindowCycleController()); window_selector_controller_.reset(new WindowSelectorController()); - tooltip_controller_.reset(new views::corewm::TooltipController( - gfx::SCREEN_TYPE_ALTERNATE)); + tooltip_controller_.reset( + new views::corewm::TooltipController( + scoped_ptr<views::corewm::Tooltip>( + new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE)))); AddPreTargetHandler(tooltip_controller_.get()); event_client_.reset(new internal::EventClientImpl); |