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

13 files changed, 39 insertions, 53 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index fd9282a..8a485d6 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -1070,9 +1070,7 @@ int BookmarkBarView::GetDragOperations(View* sender, int x, int y) {
   return DragDropTypes::DRAG_NONE;
 }
 
-void BookmarkBarView::RunMenu(views::View* view,
-                              const gfx::Point& pt,
-                              gfx::NativeView hwnd) {
+void BookmarkBarView::RunMenu(views::View* view, const gfx::Point& pt) {
   const BookmarkNode* node;
   MenuItemView::AnchorPosition anchor_point = MenuItemView::TOPLEFT;
 
@@ -1117,7 +1115,7 @@ void BookmarkBarView::RunMenu(views::View* view,
   gfx::Point screen_loc(x, 0);
   View::ConvertPointToScreen(this, &screen_loc);
   bookmark_menu_ = new BookmarkMenuController(
-      browser_, profile_, page_navigator_, GetWidget()->GetNativeView(),
+      browser_, profile_, page_navigator_, GetWindow()->GetNativeWindow(),
       node, start_index, false);
   bookmark_menu_->set_observer(this);
   bookmark_menu_->RunMenuAt(gfx::Rect(screen_loc.x(), screen_loc.y(),
@@ -1160,7 +1158,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender,
     page_navigator_->OpenURL(node->GetURL(), GURL(),
         disposition_from_event_flags, PageTransition::AUTO_BOOKMARK);
   } else {
-    bookmark_utils::OpenAll(GetWidget()->GetNativeView(), profile_,
+    bookmark_utils::OpenAll(GetWindow()->GetNativeWindow(), profile_,
         GetPageNavigator(), node, disposition_from_event_flags);
   }
   UserMetrics::RecordAction(L"ClickedBookmarkBarURLButton", profile_);
@@ -1196,7 +1194,7 @@ void BookmarkBarView::ShowContextMenu(View* source,
     parent = model_->GetBookmarkBarNode();
     nodes.push_back(parent);
   }
-  BookmarkContextMenu controller(GetWidget()->GetNativeView(), GetProfile(),
+  BookmarkContextMenu controller(GetWindow()->GetNativeWindow(), GetProfile(),
                                  browser()->GetSelectedTabContents(),
                                  parent, nodes,
                                  BookmarkContextMenuController::BOOKMARK_BAR);
@@ -1338,7 +1336,7 @@ void BookmarkBarView::ShowDropFolderForNode(const BookmarkNode* node) {
 
   drop_info_->is_menu_showing = true;
   bookmark_drop_menu_ = new BookmarkMenuController(
-      browser_, profile_, page_navigator_, GetWidget()->GetNativeView(),
+      browser_, profile_, page_navigator_, GetWindow()->GetNativeWindow(),
       node, start_index, false);
   bookmark_drop_menu_->set_observer(this);
   gfx::Point screen_loc;
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 20fcc07..f331620 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -323,8 +323,7 @@ class BookmarkBarView : public DetachableToolbarView,
   // . menu for star groups.
   // The latter two are handled by a MenuRunner, which builds the appropriate
   // menu.
-  virtual void RunMenu(views::View* view, const gfx::Point& pt,
-                       gfx::NativeView parent);
+  virtual void RunMenu(views::View* view, const gfx::Point& pt);
 
   // Invoked when a star entry corresponding to a URL on the bookmark bar is
   // pressed. Forwards to the PageNavigator to open the URL.
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index f0acd1f..183498f 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -411,7 +411,7 @@ void BookmarkBubbleView::ShowEditor() {
   // restored to the browser.
   ShowWindow(GetWidget()->GetNativeView(), SW_HIDE);
 #else
-  gfx::NativeView parent = GTK_WIDGET(
+  gfx::NativeWindow parent = GTK_WINDOW(
       static_cast<views::WidgetGtk*>(GetWidget())->GetTransientParent());
 #endif
 
diff --git a/chrome/browser/views/bookmark_context_menu.cc b/chrome/browser/views/bookmark_context_menu.cc
index 9e5a769..f1881c5 100644
--- a/chrome/browser/views/bookmark_context_menu.cc
+++ b/chrome/browser/views/bookmark_context_menu.cc
@@ -13,7 +13,7 @@
 // BookmarkContextMenu, public:
 
 BookmarkContextMenu::BookmarkContextMenu(
-    gfx::NativeView parent_window,
+    gfx::NativeWindow parent_window,
     Profile* profile,
     PageNavigator* page_navigator,
     const BookmarkNode* parent,
diff --git a/chrome/browser/views/bookmark_context_menu.h b/chrome/browser/views/bookmark_context_menu.h
index d541bdb..3771104 100644
--- a/chrome/browser/views/bookmark_context_menu.h
+++ b/chrome/browser/views/bookmark_context_menu.h
@@ -12,7 +12,7 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate,
                             public views::MenuDelegate {
  public:
   BookmarkContextMenu(
-      gfx::NativeView parent_window,
+      gfx::NativeWindow parent_window,
       Profile* profile,
       PageNavigator* page_navigator,
       const BookmarkNode* parent,
@@ -41,7 +41,7 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate,
   scoped_ptr<BookmarkContextMenuController> controller_;
 
   // The parent of dialog boxes opened from the context menu.
-  gfx::NativeView parent_window_;
+  gfx::NativeWindow parent_window_;
 
   // The menu itself.
   scoped_ptr<views::MenuItemView> menu_;
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 96345ff..1cad2735 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -564,14 +564,12 @@ void BookmarkManagerView::ShowContextMenu(views::View* source,
                                           bool is_mouse_gesture) {
   DCHECK(source == table_view_ || source == tree_view_);
   bool is_table = (source == table_view_);
-  ShowMenu(GetWidget()->GetNativeView(), x, y,
+  ShowMenu(x, y,
            is_table ? BookmarkContextMenuController::BOOKMARK_MANAGER_TABLE :
                       BookmarkContextMenuController::BOOKMARK_MANAGER_TREE);
 }
 
-void BookmarkManagerView::RunMenu(views::View* source,
-                                  const gfx::Point& pt,
-                                  HWND hwnd) {
+void BookmarkManagerView::RunMenu(views::View* source, const gfx::Point& pt) {
   // TODO(glen): when you change the buttons around and what not, futz with
   // this to make it look good. If you end up keeping padding numbers make them
   // constants.
@@ -582,10 +580,10 @@ void BookmarkManagerView::RunMenu(views::View* source,
   menu_x += UILayoutIsRightToLeft() ? (source->width() - 5) :
                                       (-source->width() + 5);
   if (source->GetID() == kOrganizeMenuButtonID) {
-    ShowMenu(hwnd, menu_x, pt.y() + 2,
+    ShowMenu(menu_x, pt.y() + 2,
              BookmarkContextMenuController::BOOKMARK_MANAGER_ORGANIZE_MENU);
   } else if (source->GetID() == kToolsMenuButtonID) {
-    ShowToolsMenu(hwnd, menu_x, pt.y() + 2);
+    ShowToolsMenu(menu_x, pt.y() + 2);
   } else {
     NOTREACHED();
   }
@@ -732,10 +730,7 @@ BookmarkModel* BookmarkManagerView::GetBookmarkModel() const {
 }
 
 void BookmarkManagerView::ShowMenu(
-    HWND host,
-    int x,
-    int y,
-    BookmarkContextMenuController::ConfigurationType config) {
+    int x, int y, BookmarkContextMenuController::ConfigurationType config) {
   if (!GetBookmarkModel()->IsLoaded())
     return;
 
@@ -753,7 +748,8 @@ void BookmarkManagerView::ShowMenu(
             BookmarkContextMenuController::BOOKMARK_MANAGER_ORGANIZE_MENU_OTHER;
       }
     }
-    BookmarkContextMenu menu(host, profile_, NULL, parent, nodes, config);
+    BookmarkContextMenu menu(GetWindow()->GetNativeWindow(), profile_, NULL,
+                             parent, nodes, config);
     menu.RunMenuAt(gfx::Point(x, y));
   } else {
     const BookmarkNode* node = GetSelectedFolder();
@@ -791,7 +787,7 @@ void BookmarkManagerView::OnCutCopyPaste(CutCopyPasteType type,
   }
 }
 
-void BookmarkManagerView::ShowToolsMenu(HWND host, int x, int y) {
+void BookmarkManagerView::ShowToolsMenu(int x, int y) {
   views::MenuItemView menu(this);
   menu.AppendMenuItemWithLabel(
           IDS_BOOKMARK_MANAGER_IMPORT_MENU,
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index af3839c..cfbc33a 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -161,7 +161,7 @@ class BookmarkManagerView : public views::View,
                                bool is_mouse_gesture);
 
   // ViewMenuDelegate.
-  virtual void RunMenu(views::View* source, const gfx::Point& pt, HWND hwnd);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // MenuDelegate.
   virtual void ExecuteCommand(int id);
@@ -198,9 +198,7 @@ class BookmarkManagerView : public views::View,
 
   // Shows the menu. This is invoked to show the context menu for table/tree
   // as well as to show the menu from the organize button.
-  void ShowMenu(HWND host,
-                int x,
-                int y,
+  void ShowMenu(int x, int y,
                 BookmarkContextMenuController::ConfigurationType config);
 
   // Invoked to handle cut/copy/paste from the table or tree. If |from_table|
@@ -208,7 +206,7 @@ class BookmarkManagerView : public views::View,
   void OnCutCopyPaste(CutCopyPasteType type, bool from_table);
 
   // Shows the tools menu.
-  void ShowToolsMenu(HWND host, int x, int y);
+  void ShowToolsMenu(int x, int y);
 
   // Shows the import/export file chooser. These invoke
   // FileSelected/FileSelectionCanceled when done.
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index e3475aa..4255ffd 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "grit/theme_resources.h"
-#include "views/widget/widget.h"
+#include "views/window/window.h"
 
 BookmarkMenuButton::BookmarkMenuButton(Browser* browser)
     : views::MenuButton(NULL, std::wstring(), NULL, false),
@@ -117,14 +117,13 @@ void BookmarkMenuButton::BookmarkMenuDeleted(
 }
 
 void BookmarkMenuButton::RunMenu(views::View* source,
-                                 const gfx::Point& pt,
-                                 gfx::NativeView hwnd) {
-  RunMenu(source, pt, hwnd, false);
+                                 const gfx::Point& pt) {
+  RunMenu(source, pt, GetWindow()->GetNativeWindow(), false);
 }
 
 void BookmarkMenuButton::RunMenu(views::View* source,
                                  const gfx::Point& pt,
-                                 gfx::NativeView hwnd,
+                                 gfx::NativeWindow hwnd,
                                  bool for_drop) {
   Profile* profile = browser_->profile();
   BookmarkMenuController* menu = new BookmarkMenuController(
@@ -169,5 +168,5 @@ void BookmarkMenuButton::StopShowFolderDropMenuTimer() {
 }
 
 void BookmarkMenuButton::ShowDropMenu() {
-  RunMenu(NULL, gfx::Point(), GetWidget()->GetNativeView(), true);
+  RunMenu(NULL, gfx::Point(), GetWindow()->GetNativeWindow(), true);
 }
diff --git a/chrome/browser/views/bookmark_menu_button.h b/chrome/browser/views/bookmark_menu_button.h
index 7a7fd7e..2ac1fbd 100644
--- a/chrome/browser/views/bookmark_menu_button.h
+++ b/chrome/browser/views/bookmark_menu_button.h
@@ -39,15 +39,13 @@ class BookmarkMenuButton : public views::MenuButton,
   virtual void BookmarkMenuDeleted(BookmarkMenuController* controller);
 
   // ViewMenuDelegate.
-  virtual void RunMenu(views::View* source,
-                       const gfx::Point& pt,
-                       gfx::NativeView hwnd);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
  private:
   // Shows the menu.
   void RunMenu(views::View* source,
                const gfx::Point& pt,
-               gfx::NativeView hwnd,
+               gfx::NativeWindow hwnd,
                bool for_drop);
 
   // Returns the bookmark model.
diff --git a/chrome/browser/views/bookmark_menu_controller_views.cc b/chrome/browser/views/bookmark_menu_controller_views.cc
index 4dabc1d..58ff604 100644
--- a/chrome/browser/views/bookmark_menu_controller_views.cc
+++ b/chrome/browser/views/bookmark_menu_controller_views.cc
@@ -21,7 +21,7 @@
 BookmarkMenuController::BookmarkMenuController(Browser* browser,
                                                Profile* profile,
                                                PageNavigator* navigator,
-                                               gfx::NativeView parent,
+                                               gfx::NativeWindow parent,
                                                const BookmarkNode* node,
                                                int start_child_index,
                                                bool show_other_folder)
diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h
index 0fb720a..fa6462f 100644
--- a/chrome/browser/views/bookmark_menu_controller_views.h
+++ b/chrome/browser/views/bookmark_menu_controller_views.h
@@ -43,7 +43,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   BookmarkMenuController(Browser* browser,
                          Profile* profile,
                          PageNavigator* page_navigator,
-                         gfx::NativeView parent,
+                         gfx::NativeWindow parent,
                          const BookmarkNode* node,
                          int start_child_index,
                          bool show_other_folder);
@@ -120,7 +120,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   PageNavigator* page_navigator_;
 
   // Parent of menus.
-  gfx::NativeView parent_;
+  gfx::NativeWindow parent_;
 
   // The node we're showing the contents of.
   const BookmarkNode* node_;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index d21db27..8021553 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -252,14 +252,13 @@ bool ToolbarView::GetAcceleratorInfo(int id, views::Accelerator* accel) {
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::MenuDelegate implementation:
 
-void ToolbarView::RunMenu(views::View* source, const gfx::Point& pt,
-                          gfx::NativeView parent) {
+void ToolbarView::RunMenu(views::View* source, const gfx::Point& pt) {
   switch (source->GetID()) {
     case VIEW_ID_PAGE_MENU:
-      RunPageMenu(pt, parent);
+      RunPageMenu(pt);
       break;
     case VIEW_ID_APP_MENU:
-      RunAppMenu(pt, parent);
+      RunAppMenu(pt);
       break;
     default:
       NOTREACHED() << "Invalid source menu.";
@@ -997,12 +996,12 @@ void ToolbarView::LoadRightSideControlsImages() {
     bookmark_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_BOOKMARK));
 }
 
-void ToolbarView::RunPageMenu(const gfx::Point& pt, gfx::NativeView parent) {
+void ToolbarView::RunPageMenu(const gfx::Point& pt) {
   CreatePageMenu();
   page_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
-void ToolbarView::RunAppMenu(const gfx::Point& pt, gfx::NativeView parent) {
+void ToolbarView::RunAppMenu(const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index c7080b8..f1ac12d 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -114,8 +114,7 @@ class ToolbarView : public views::View,
   virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel);
 
   // Overridden from views::MenuDelegate:
-  virtual void RunMenu(views::View* source, const gfx::Point& pt,
-                       gfx::NativeView hwnd);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Overridden from GetProfilesHelper::Delegate:
   virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
@@ -180,8 +179,8 @@ class ToolbarView : public views::View,
   void LoadRightSideControlsImages();
 
   // Runs various menus.
-  void RunPageMenu(const gfx::Point& pt, gfx::NativeView hwnd);
-  void RunAppMenu(const gfx::Point& pt, gfx::NativeView hwnd);
+  void RunPageMenu(const gfx::Point& pt);
+  void RunAppMenu(const gfx::Point& pt);
 
   void CreatePageMenu();
   void CreateZoomMenuContents();