Converts a bunch things from NativeWindow to NativeView to make it

easier for callers. Also gets bookmark menu button to compile.

I'm also removing a function I just added to gtk_util as it's not
needed. GTK offers gtk_widget_get_toplevel which does what I need.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/115831

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17029 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 10 deletions

diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index 3f6c43a..b06e0df 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -4,6 +4,12 @@
 
 #include "chrome/browser/views/bookmark_menu_button.h"
 
+#include "build/build_config.h"
+
+#if defined(OS_GTK)
+#include <gtk/gtk.h>
+#endif
+
 #include "app/resource_bundle.h"
 #include "app/os_exchange_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -129,9 +135,13 @@ void BookmarkMenuButton::StartShowFolderDropMenuTimer() {
   if (show_drop_menu_timer_.IsRunning())
     return;
 
+#if defined(OS_WIN)
   static DWORD delay = 0;
   if (!delay && !SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &delay, 0))
     delay = 400;
+#else
+  static int delay = 400;
+#endif
   show_drop_menu_timer_.Start(base::TimeDelta::FromMilliseconds(delay),
                               this, &BookmarkMenuButton::ShowDropMenu);
 }
diff --git a/chrome/browser/views/bookmark_menu_controller_views.cc b/chrome/browser/views/bookmark_menu_controller_views.cc
index 2ac58eb..cd550ca 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::NativeWindow parent,
+                                               gfx::NativeView parent,
                                                BookmarkNode* node,
                                                int start_child_index,
                                                bool show_other_folder)
@@ -48,15 +48,10 @@ void BookmarkMenuController::RunMenuAt(
     bool for_drop) {
   for_drop_ = for_drop;
   profile_->GetBookmarkModel()->AddObserver(this);
-#if defined(OS_WIN)
-  gfx::NativeView widget = parent_;
-#else
-  gfx::NativeView widget = GTK_WIDGET(parent_);
-#endif
   if (for_drop) {
-    menu_->RunMenuForDropAt(widget, bounds, position);
+    menu_->RunMenuForDropAt(parent_, bounds, position);
   } else {
-    menu_->RunMenuAt(widget, bounds, position, false);
+    menu_->RunMenuAt(parent_, bounds, position, false);
     delete this;
   }
 }
diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h
index 4764cd0..54c11de 100644
--- a/chrome/browser/views/bookmark_menu_controller_views.h
+++ b/chrome/browser/views/bookmark_menu_controller_views.h
@@ -38,7 +38,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   BookmarkMenuController(Browser* browser,
                          Profile* profile,
                          PageNavigator* page_navigator,
-                         gfx::NativeWindow parent,
+                         gfx::NativeView parent,
                          BookmarkNode* node,
                          int start_child_index,
                          bool show_other_folder);
@@ -110,7 +110,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   PageNavigator* page_navigator_;
 
   // Parent of menus.
-  gfx::NativeWindow parent_;
+  gfx::NativeView parent_;
 
   // The node we're showing the contents of.
   BookmarkNode* node_;