diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 19:08:04 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 19:08:04 +0000 |
| commit | a1b7a82fbb37bce916ef205bf862cb940b5307df (patch) | |
| tree | 91be529daf93c6b1d3186876b042ac3e2adcfa58 /ash/shell | |
| parent | 4447016b31992cea934c3f83fb5d0ddd4147f56e (diff) | |
| download | chromium_src-a1b7a82fbb37bce916ef205bf862cb940b5307df.zip chromium_src-a1b7a82fbb37bce916ef205bf862cb940b5307df.tar.gz chromium_src-a1b7a82fbb37bce916ef205bf862cb940b5307df.tar.bz2 | |
Gets tooltips to work for desktop aura. This constrains the tooltips
to the bounds of the Widget. We'll see how well that works.
BUG=175441
TEST=make sure tooltips work for win-aura.
R=varunjain@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12334017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/lock_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index 56c0f27..16895c6 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -6,13 +6,13 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/shell/example_factory.h" -#include "ash/tooltips/tooltip_controller.h" #include "base/utf_string_conversions.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/views/controls/button/text_button.h" +#include "ui/views/corewm/tooltip_controller.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -100,6 +100,7 @@ void CreateLockScreen() { widget->GetNativeView()->SetName("LockView"); widget->GetNativeView()->Focus(); + // TODO: it shouldn't be necessary to invoke UpdateTooltip() here. Shell::GetInstance()->tooltip_controller()->UpdateTooltip( widget->GetNativeView()); } |