Converts some uses of native_view to native_window. This is necessitated...

views/controls/menu/menu_controller.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 25 matching lines @@
  public:
   friend class MenuHostRootView;
   friend class MenuItemView;
 
   // If a menu is currently active, this returns the controller for it.
   static MenuController* GetActiveInstance();
 
   // Runs the menu at the specified location. If the menu was configured to
   // block, the selected item is returned. If the menu does not block this
   // returns NULL immediately.
-  MenuItemView* Run(gfx::NativeView parent,
+  MenuItemView* Run(gfx::NativeWindow parent,
                     MenuItemView* root,
                     const gfx::Rect& bounds,
                     MenuItemView::AnchorPosition position,
                     int* mouse_event_flags);
 
   // Whether or not Run blocks.
   bool IsBlockingRun() const { return blocking_run_; }
 
   // Sets the selection to menu_item, a value of NULL unselects everything.
   // If open_submenu is true and menu_item has a submenu, the submenu is shown.
@@ skipping 289 matching lines @@
   // menu after the mouse moves out of the of the menu. This is necessitated by
   // the lack of an ability to detect when the drag has completed from the drop
   // side.
   base::OneShotTimer<MenuController> cancel_all_timer_;
 
   // Drop target.
   MenuItemView* drop_target_;
   MenuDelegate::DropPosition drop_position_;
 
   // Owner of child windows.
-  gfx::NativeView owner_;
+  gfx::NativeWindow owner_;
 
   // Indicates a possible drag operation.
   bool possible_drag_;
 
   // Location the mouse was pressed at. Used to detect d&d.
   int press_x_;
   int press_y_;
 
   // We get a slew of drag updated messages as the mouse is over us. To avoid
   // continually processing whether we can drop, we cache the coordinates.
   bool valid_drop_coordinates_;
   int drop_x_;
   int drop_y_;
   int last_drop_operation_;
 
   // If true, we're in the middle of invoking ShowAt on a submenu.
   bool showing_submenu_;
 
   // Task for scrolling the menu. If non-null indicates a scroll is currently
   // underway.
   scoped_ptr<MenuScrollTask> scroll_task_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_