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

5 files changed, 11 insertions, 12 deletions

diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
index 3030e6e..15791a8 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
@@ -48,7 +48,7 @@ class EditFolderController : public InputWindowDialog::Delegate,
   }
 
   static void Show(Profile* profile,
-                   gfx::NativeView wnd,
+                   gfx::NativeWindow wnd,
                    const BookmarkNode* node,
                    bool is_new,
                    bool show_in_manager) {
@@ -60,7 +60,7 @@ class EditFolderController : public InputWindowDialog::Delegate,
 
  private:
   EditFolderController(Profile* profile,
-                       gfx::NativeView wnd,
+                       gfx::NativeWindow wnd,
                        const BookmarkNode* node,
                        bool is_new,
                        bool show_in_manager)
@@ -193,7 +193,7 @@ class SelectOnCreationHandler : public BookmarkEditor::Handler {
 }  // namespace
 
 BookmarkContextMenuController::BookmarkContextMenuController(
-    gfx::NativeView parent_window,
+    gfx::NativeWindow parent_window,
     BookmarkContextMenuControllerDelegate* delegate,
     Profile* profile,
     PageNavigator* navigator,
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
index 5c8c20b..66f9f61 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
@@ -56,7 +56,7 @@ class BookmarkContextMenuController : public BookmarkModelObserver {
   // |selection| is the nodes the context menu operates on and may be empty.
   // |configuration| determines which items to show.
   BookmarkContextMenuController(
-      gfx::NativeView parent_window,
+      gfx::NativeWindow parent_window,
       BookmarkContextMenuControllerDelegate* delegate,
       Profile* profile,
       PageNavigator* navigator,
@@ -113,8 +113,7 @@ class BookmarkContextMenuController : public BookmarkModelObserver {
   // parent_ is returned.
   const BookmarkNode* GetParentForNewNodes() const;
 
-  // TODO(beng): change to gfx::NativeWindow
-  gfx::NativeView parent_window_;
+  gfx::NativeWindow parent_window_;
   BookmarkContextMenuControllerDelegate* delegate_;
   Profile* profile_;
   PageNavigator* navigator_;
diff --git a/chrome/browser/bookmarks/bookmark_editor.h b/chrome/browser/bookmarks/bookmark_editor.h
index 6c82cbd..0b98406 100644
--- a/chrome/browser/bookmarks/bookmark_editor.h
+++ b/chrome/browser/bookmarks/bookmark_editor.h
@@ -38,7 +38,7 @@ class BookmarkEditor {
   // If |show_tree| is false the tree is not shown. BookmarkEditor takes
   // ownership of |handler| and deletes it when done. |handler| may be
   // null. See description of Handler for details.
-  static void Show(gfx::NativeView parent_window,
+  static void Show(gfx::NativeWindow parent_window,
                    Profile* profile,
                    const BookmarkNode* parent,
                    const BookmarkNode* node,
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index e64c42d..a8f5860 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -138,7 +138,7 @@ void OpenAllImpl(const BookmarkNode* node,
   }
 }
 
-bool ShouldOpenAll(gfx::NativeView parent,
+bool ShouldOpenAll(gfx::NativeWindow parent,
                    const std::vector<const BookmarkNode*>& nodes) {
   int descendant_count = 0;
   for (size_t i = 0; i < nodes.size(); ++i)
@@ -310,7 +310,7 @@ void CloneDragData(BookmarkModel* model,
     CloneDragDataImpl(model, elements[i], parent, index_to_add_at + i);
 }
 
-void OpenAll(gfx::NativeView parent,
+void OpenAll(gfx::NativeWindow parent,
              Profile* profile,
              PageNavigator* navigator,
              const std::vector<const BookmarkNode*>& nodes,
@@ -338,7 +338,7 @@ void OpenAll(gfx::NativeView parent,
     OpenAllImpl(nodes[i], initial_disposition, &navigator, &opened_url);
 }
 
-void OpenAll(gfx::NativeView parent,
+void OpenAll(gfx::NativeWindow parent,
              Profile* profile,
              PageNavigator* navigator,
              const BookmarkNode* node,
diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h
index 513f479..0c5d53d 100644
--- a/chrome/browser/bookmarks/bookmark_utils.h
+++ b/chrome/browser/bookmarks/bookmark_utils.h
@@ -76,14 +76,14 @@ void CloneDragData(BookmarkModel* model,
 // |navigator| is used to open the URLs. If |navigator| is NULL the last
 // tabbed browser with the profile |profile| is used. If there is no browser
 // with the specified profile a new one is created.
-void OpenAll(gfx::NativeView parent,
+void OpenAll(gfx::NativeWindow parent,
              Profile* profile,
              PageNavigator* navigator,
              const std::vector<const BookmarkNode*>& nodes,
              WindowOpenDisposition initial_disposition);
 
 // Convenience for opening a single BookmarkNode.
-void OpenAll(gfx::NativeView parent,
+void OpenAll(gfx::NativeWindow parent,
              Profile* profile,
              PageNavigator* navigator,
              const BookmarkNode* node,