diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 19:22:26 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 19:22:26 +0000 |
| commit | d6d6d586d2a91d13d06a8bce53a2d03f2458f9c2 (patch) | |
| tree | f662039f70110c555ec6fb096b389b73af31af2d /views/controls/menu/menu_host_gtk.cc | |
| parent | 7587ee0fa4399ed0485559559b0ee9228daf0337 (diff) | |
| download | chromium_src-d6d6d586d2a91d13d06a8bce53a2d03f2458f9c2.zip chromium_src-d6d6d586d2a91d13d06a8bce53a2d03f2458f9c2.tar.gz chromium_src-d6d6d586d2a91d13d06a8bce53a2d03f2458f9c2.tar.bz2 | |
Converts some uses of native_view to native_window. This is necessitated
by wanting to parent bookmarkeditor to browserwindow, which returns a
native_window.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/270067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_host_gtk.cc')
| -rw-r--r-- | views/controls/menu/menu_host_gtk.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/views/controls/menu/menu_host_gtk.cc b/views/controls/menu/menu_host_gtk.cc index aee0d17..11033c4 100644 --- a/views/controls/menu/menu_host_gtk.cc +++ b/views/controls/menu/menu_host_gtk.cc @@ -30,11 +30,11 @@ MenuHost::MenuHost(SubmenuView* submenu) } } -void MenuHost::Init(gfx::NativeView parent, +void MenuHost::Init(gfx::NativeWindow parent, const gfx::Rect& bounds, View* contents_view, bool do_capture) { - WidgetGtk::Init(parent, bounds); + WidgetGtk::Init(GTK_WIDGET(parent), bounds); SetContentsView(contents_view); // TODO(sky): see if there is some way to show without changing focus. Show(); @@ -65,6 +65,10 @@ void MenuHost::Init(gfx::NativeView parent, } } +gfx::NativeWindow MenuHost::GetNativeWindow() { + return GTK_WINDOW(GetNativeView()); +} + void MenuHost::Show() { WidgetGtk::Show(); } |