Make bookmark_bar_view.h hopefully compile on Linux.

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

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

3 files changed, 11 insertions, 13 deletions

diff --git a/chrome/browser/bookmarks/bookmark_context_menu.h b/chrome/browser/bookmarks/bookmark_context_menu.h
index 8aea2f1..bf3782d 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu.h
@@ -64,7 +64,7 @@ class BookmarkContextMenu : public BookmarkModelObserver,
                       ConfigurationType configuration);
   virtual ~BookmarkContextMenu();
 
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
   // Shows the menu at the specified place.
   void RunMenuAt(int x, int y);
 
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 7f9a2fd..9dd3158 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -265,11 +265,13 @@ class BookmarkFolderButton : public views::MenuButton {
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
+}  // namespace
+
 // DropInfo -------------------------------------------------------------------
 
 // Tracks drops on the BookmarkBarView.
 
-struct DropInfo {
+struct BookmarkBarView::DropInfo {
   DropInfo() : drop_index(-1), is_menu_showing(false), valid(false) {}
 
   // Whether the data is valid.
@@ -304,7 +306,7 @@ struct DropInfo {
 
 // ButtonSeparatorView  --------------------------------------------------------
 
-class ButtonSeparatorView : public views::View {
+class BookmarkBarView::ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
@@ -341,8 +343,6 @@ class ButtonSeparatorView : public views::View {
   DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView);
 };
 
-}  // namespace
-
 // BookmarkBarView ------------------------------------------------------------
 
 // static
@@ -1091,7 +1091,7 @@ int BookmarkBarView::GetDragOperations(View* sender, int x, int y) {
 
 void BookmarkBarView::RunMenu(views::View* view,
                               const gfx::Point& pt,
-                              HWND hwnd) {
+                              gfx::NativeView hwnd) {
   BookmarkNode* node;
   MenuItemView::AnchorPosition anchor_point = MenuItemView::TOPLEFT;
 
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index f9a8c31..c32951c 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -22,12 +22,6 @@ class Browser;
 class PageNavigator;
 class PrefService;
 
-namespace {
-class MenuRunner;
-class ButtonSeparatorView;
-struct DropInfo;
-}
-
 namespace views {
 class MenuItemView;
 }
@@ -183,6 +177,9 @@ class BookmarkBarView : public views::View,
   static bool testing_;
 
  private:
+  class ButtonSeparatorView;
+  struct DropInfo;
+
   // Task that invokes ShowDropFolderForNode when run. ShowFolderDropMenuTask
   // deletes itself once run.
   class ShowFolderDropMenuTask : public Task {
@@ -301,7 +298,8 @@ class BookmarkBarView : public views::View,
   // . 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, HWND hwnd);
+  virtual void RunMenu(views::View* view, const gfx::Point& pt,
+                       gfx::NativeView parent);
 
   // Invoked when a star entry corresponding to a URL on the bookmark bar is
   // pressed. Forwards to the PageNavigator to open the URL.