summaryrefslogtreecommitdiffstats
path: root/ui/views/test/test_views_delegate.h
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 21:23:56 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 21:23:56 +0000
commit7f6e56001fa0dcf2ec03b7264b238401319e5371 (patch)
treea2edb305c247e068dac6a778c5be46f2e67ff255 /ui/views/test/test_views_delegate.h
parent893a65620be4a25bc6a3e533bb2bfa17ce07697d (diff)
downloadchromium_src-7f6e56001fa0dcf2ec03b7264b238401319e5371.zip
chromium_src-7f6e56001fa0dcf2ec03b7264b238401319e5371.tar.gz
chromium_src-7f6e56001fa0dcf2ec03b7264b238401319e5371.tar.bz2
Fix tooltips in ash.
ash::internal::TooltipController was conditionally setting InitParams::parent, which was putting tooltips in the wrong part of the ash hierarchy on some platforms, while on others, there was no contextual information. Pass InitParams::context on all platforms instead; this is what context is for. BUG=151718, 161882 Review URL: https://chromiumcodereview.appspot.com/11516007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/test/test_views_delegate.h')
-rw-r--r--ui/views/test/test_views_delegate.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
index 31076eb..b6ec851 100644
--- a/ui/views/test/test_views_delegate.h
+++ b/ui/views/test/test_views_delegate.h
@@ -62,7 +62,8 @@ class TestViewsDelegate : public ViewsDelegate {
virtual NativeWidget* CreateNativeWidget(
Widget::InitParams::Type type,
internal::NativeWidgetDelegate* delegate,
- gfx::NativeView parent) OVERRIDE;
+ gfx::NativeView parent,
+ gfx::NativeView context) OVERRIDE;
private:
bool use_transparent_windows_;