summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 20:15:23 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 20:15:23 +0000
commit5eb79e3c55a5778c928c6509379d18dd7e0d44ca (patch)
tree84834c985c67a303adb2deb4ba6ff839729fd269 /views
parenta7d8894b94d271931f4c04900030f93022589b03 (diff)
downloadchromium_src-5eb79e3c55a5778c928c6509379d18dd7e0d44ca.zip
chromium_src-5eb79e3c55a5778c928c6509379d18dd7e0d44ca.tar.gz
chromium_src-5eb79e3c55a5778c928c6509379d18dd7e0d44ca.tar.bz2
Change the native type passed to Menu to get the system menu. The system menu
is associated with a window, so it should be a NativeWindow instead of NativeWidget. Review URL: http://codereview.chromium.org/113850 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/menu/menu.h2
-rw-r--r--views/controls/menu/menu_win.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index 0017ac1..04da77a 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -182,7 +182,7 @@ class Menu {
// Creates a new menu with the contents of the system menu for the given
// parent window. The caller owns the returned pointer.
- static Menu* GetSystemMenu(gfx::NativeView parent);
+ static Menu* GetSystemMenu(gfx::NativeWindow parent);
void set_delegate(Delegate* delegate) { delegate_ = delegate; }
Delegate* delegate() const { return delegate_; }
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index 84c3fac..1c27d85 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -237,7 +237,7 @@ Menu* Menu::Create(Delegate* delegate,
}
// static
-Menu* Menu::GetSystemMenu(gfx::NativeView parent) {
+Menu* Menu::GetSystemMenu(gfx::NativeWindow parent) {
return new views::MenuWin(::GetSystemMenu(parent, FALSE));
}