Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1151)

Unified Diff: views/controls/menu/menu_controller.cc

Issue 270067: Converts some uses of native_view to native_window. This is necessitated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/controls/menu/menu_controller.cc
===================================================================
--- views/controls/menu/menu_controller.cc (revision 28706)
+++ views/controls/menu/menu_controller.cc (working copy)
@@ -142,7 +142,7 @@
static int nested_depth = 0;
#endif
-MenuItemView* MenuController::Run(gfx::NativeView parent,
+MenuItemView* MenuController::Run(gfx::NativeWindow parent,
MenuItemView* root,
const gfx::Rect& bounds,
MenuItemView::AnchorPosition position,
@@ -1329,8 +1329,8 @@
SubmenuView* submenu = state_.item->GetRootMenuItem()->GetSubmenu();
submenu->ReleaseCapture();
- if (submenu->native_view() && submenu->native_view() &&
- GetWindowThreadProcessId(submenu->native_view(), NULL) !=
+ if (submenu->native_window() && submenu->native_window() &&
+ GetWindowThreadProcessId(submenu->native_window(), NULL) !=
GetWindowThreadProcessId(window, NULL)) {
// Even though we have mouse capture, windows generates a mouse event
// if the other window is in a separate thread. Don't generate an event in

Powered by Google App Engine
This is Rietveld 408576698