Make bookmark_context_menu.cc and bookmark_drop_info.cc compile on Posix.

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

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

7 files changed, 58 insertions, 36 deletions

diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index c4d067b..727d16a 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -11,16 +11,20 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
+#include "chrome/common/l10n_util.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/common/pref_service.h"
+#include "grit/generated_resources.h"
+
+// TODO(port): Port these files.
+#if defined(OS_WIN)
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
 #include "chrome/browser/views/input_window.h"
-#include "chrome/common/l10n_util.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/common/pref_service.h"
 #include "chrome/views/window.h"
-#include "grit/generated_resources.h"
+#endif
 
 namespace {
 
@@ -52,19 +56,19 @@ class EditFolderController : public InputWindowDelegate,
   }
 
   static void Show(Profile* profile,
-                   HWND hwnd,
+                   gfx::NativeWindow wnd,
                    BookmarkNode* node,
                    bool is_new,
                    bool show_in_manager) {
     // EditFolderController deletes itself when done.
     EditFolderController* controller =
-        new EditFolderController(profile, hwnd, node, is_new, show_in_manager);
+        new EditFolderController(profile, wnd, node, is_new, show_in_manager);
     controller->Show();
   }
 
  private:
   EditFolderController(Profile* profile,
-                       HWND hwnd,
+                       gfx::NativeWindow wnd,
                        BookmarkNode* node,
                        bool is_new,
                        bool show_in_manager)
@@ -74,7 +78,7 @@ class EditFolderController : public InputWindowDelegate,
         is_new_(is_new),
         show_in_manager_(show_in_manager) {
     DCHECK(is_new_ || node);
-    window_ = CreateInputWindow(hwnd, this);
+    window_ = CreateInputWindow(wnd, this);
     model_->AddObserver(this);
   }
 
@@ -209,14 +213,14 @@ class SelectOnCreationHandler : public BookmarkEditorView::Handler {
 // BookmarkContextMenu -------------------------------------------
 
 BookmarkContextMenu::BookmarkContextMenu(
-    HWND hwnd,
+    gfx::NativeWindow wnd,
     Profile* profile,
     Browser* browser,
     PageNavigator* navigator,
     BookmarkNode* parent,
     const std::vector<BookmarkNode*>& selection,
     ConfigurationType configuration)
-    : hwnd_(hwnd),
+    : wnd_(wnd),
       profile_(profile),
       browser_(browser),
       navigator_(navigator),
@@ -320,7 +324,7 @@ void BookmarkContextMenu::RunMenuAt(int x, int y) {
   views::MenuItemView::AnchorPosition anchor =
       (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
       views::MenuItemView::TOPRIGHT : views::MenuItemView::TOPLEFT;
-  menu_->RunMenuAt(hwnd_, gfx::Rect(x, y, 0, 0), anchor, true);
+  menu_->RunMenuAt(wnd_, gfx::Rect(x, y, 0, 0), anchor, true);
 }
 
 void BookmarkContextMenu::ExecuteCommand(int id) {
@@ -345,7 +349,7 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
             L"BookmarkBar_ContextMenu_OpenAllIncognito", profile_);
       }
 
-      bookmark_utils::OpenAll(hwnd_, profile_, navigator, selection_,
+      bookmark_utils::OpenAll(wnd_, profile_, navigator, selection_,
                               initial_disposition);
       break;
     }
@@ -365,10 +369,10 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
           editor_config = BookmarkEditorView::SHOW_TREE;
         else
           editor_config = BookmarkEditorView::NO_TREE;
-        BookmarkEditorView::Show(hwnd_, profile_, NULL, selection_[0],
+        BookmarkEditorView::Show(wnd_, profile_, NULL, selection_[0],
                                  editor_config, NULL);
       } else {
-        EditFolderController::Show(profile_, hwnd_, selection_[0], false,
+        EditFolderController::Show(profile_, wnd_, selection_[0], false,
                                    false);
       }
       break;
@@ -397,7 +401,7 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
         // This is owned by the BookmarkEditorView.
         handler = new SelectOnCreationHandler(profile_);
       }
-      BookmarkEditorView::Show(hwnd_, profile_, GetParentForNewNodes(), NULL,
+      BookmarkEditorView::Show(wnd_, profile_, GetParentForNewNodes(), NULL,
                                editor_config, handler);
       break;
     }
@@ -406,7 +410,7 @@ void BookmarkContextMenu::ExecuteCommand(int id) {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_NewFolder",
                                 profile_);
 
-      EditFolderController::Show(profile_, hwnd_, GetParentForNewNodes(),
+      EditFolderController::Show(profile_, wnd_, GetParentForNewNodes(),
                                  true, (configuration_ != BOOKMARK_BAR));
       break;
     }
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.h b/chrome/browser/bookmarks/bookmark_context_menu.h
index 80769ff..f0408f3 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu.h
@@ -7,8 +7,16 @@
 
 #include <vector>
 
+#include "base/basictypes.h"
+#include "base/gfx/native_widget_types.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+
+// TODO(port): Port this file.
+#if defined(OS_WIN)
 #include "chrome/views/chrome_menu.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
 
 class Browser;
 class PageNavigator;
@@ -40,7 +48,7 @@ class BookmarkContextMenu : public views::MenuDelegate,
   // |parent| is the parent for newly created nodes if |selection| is empty.
   // |selection| is the nodes the context menu operates on and may be empty.
   // |configuration| determines which items to show.
-  BookmarkContextMenu(HWND hwnd,
+  BookmarkContextMenu(gfx::NativeWindow hwnd,
                       Profile* profile,
                       Browser* browser,
                       PageNavigator* navigator,
@@ -96,7 +104,7 @@ class BookmarkContextMenu : public views::MenuDelegate,
   // parent_ is returned.
   BookmarkNode* GetParentForNewNodes() const;
 
-  HWND hwnd_;
+  gfx::NativeWindow wnd_;
   Profile* profile_;
   Browser* browser_;
   PageNavigator* navigator_;
diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc
index 646b35b..0e39cd7 100644
--- a/chrome/browser/bookmarks/bookmark_drop_info.cc
+++ b/chrome/browser/bookmarks/bookmark_drop_info.cc
@@ -4,15 +4,20 @@
 
 #include "chrome/browser/bookmarks/bookmark_drop_info.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
+#include "base/basictypes.h"
 #include "chrome/views/event.h"
 #include "chrome/views/view_constants.h"
 
-BookmarkDropInfo::BookmarkDropInfo(HWND hwnd, int top_margin)
+BookmarkDropInfo::BookmarkDropInfo(gfx::NativeWindow wnd, int top_margin)
     : source_operations_(0),
       is_control_down_(false),
       last_y_(0),
       drop_operation_(0),
-      hwnd_(hwnd),
+      wnd_(wnd),
       top_margin_(top_margin),
       scroll_up_(false) {
 }
@@ -22,10 +27,16 @@ void BookmarkDropInfo::Update(const views::DropTargetEvent& event) {
   is_control_down_ = event.IsControlDown();
   last_y_ = event.y();
 
+#if defined(OS_WIN)
   RECT client_rect;
-  GetClientRect(hwnd_, &client_rect);
-  scroll_up_ = (last_y_ <= top_margin_ + views::kAutoscrollSize);
+  GetClientRect(wnd_, &client_rect);
   bool scroll_down = (last_y_ >= client_rect.bottom - views::kAutoscrollSize);
+#else
+  // TODO(port): Get the dimensions of the appropriate view/widget.
+  NOTIMPLEMENTED();
+  bool scroll_down = false;
+#endif
+  scroll_up_ = (last_y_ <= top_margin_ + views::kAutoscrollSize);
   if (scroll_up_ || scroll_down) {
     if (!scroll_timer_.IsRunning()) {
       scroll_timer_.Start(
@@ -39,6 +50,11 @@ void BookmarkDropInfo::Update(const views::DropTargetEvent& event) {
 }
 
 void BookmarkDropInfo::Scroll() {
-  SendMessage(hwnd_, WM_VSCROLL, scroll_up_ ? SB_LINEUP : SB_LINEDOWN, NULL);
+#if defined(OS_WIN)
+  SendMessage(wnd_, WM_VSCROLL, scroll_up_ ? SB_LINEUP : SB_LINEDOWN, NULL);
   Scrolled();
+#else
+  // TODO(port): Scroll the appropriate view/widget.
+  NOTIMPLEMENTED();
+#endif
 }
diff --git a/chrome/browser/bookmarks/bookmark_drop_info.h b/chrome/browser/bookmarks/bookmark_drop_info.h
index f4daf89..b7dc643 100644
--- a/chrome/browser/bookmarks/bookmark_drop_info.h
+++ b/chrome/browser/bookmarks/bookmark_drop_info.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_
 
-#include <windows.h>
-
+#include "base/basictypes.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/timer.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 
@@ -20,7 +20,7 @@ class DropTargetEvent;
 // BookmarksFolderTreeView.
 class BookmarkDropInfo {
  public:
-  BookmarkDropInfo(HWND hwnd, int top_margin);
+  BookmarkDropInfo(gfx::NativeWindow hwnd, int top_margin);
   virtual ~BookmarkDropInfo() {}
 
   // Invoke this from OnDragUpdated. It resets source_operations,
@@ -67,7 +67,7 @@ class BookmarkDropInfo {
 
   int drop_operation_;
 
-  HWND hwnd_;
+  gfx::NativeWindow wnd_;
 
   // Margin in addition to views::kAutoscrollSize that the mouse is allowed to
   // be over before we autoscroll.
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 8c7f731d..45e7c6d 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h
index b41542b..9419731 100644
--- a/chrome/browser/bookmarks/bookmark_utils.h
+++ b/chrome/browser/bookmarks/bookmark_utils.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/gfx/native_widget_types.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/history/snippet.h"
 #include "webkit/glue/window_open_disposition.h"
@@ -42,27 +43,23 @@ void CloneDragData(BookmarkModel* model,
                    BookmarkNode* parent,
                    int index_to_add_at);
 
-#if defined(OS_WIN)
-// TODO(port): Make OpenAll portable (remove HWND).
-
 // Recursively opens all bookmarks. |initial_disposition| dictates how the
 // first URL is opened, all subsequent URLs are opened as background tabs.
 // |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(HWND parent,
+void OpenAll(gfx::NativeWindow parent,
              Profile* profile,
              PageNavigator* navigator,
              const std::vector<BookmarkNode*>& nodes,
              WindowOpenDisposition initial_disposition);
 
 // Convenience for opening a single BookmarkNode.
-void OpenAll(HWND parent,
+void OpenAll(gfx::NativeWindow parent,
              Profile* profile,
              PageNavigator* navigator,
              BookmarkNode* node,
              WindowOpenDisposition initial_disposition);
-#endif  // defined(OS_WIN)
 
 // Copies nodes onto the clipboard. If |remove_nodes| is true the nodes are
 // removed after copied to the clipboard. The nodes are copied in such a way
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 1079f91..4ef5838 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -670,8 +670,6 @@ if not env.Bit('windows'):
       'automation/automation_provider.cc',
       'automation/automation_provider_list.cc',
       'automation/ui_controls.cc',
-      'bookmarks/bookmark_context_menu.cc',
-      'bookmarks/bookmark_drop_info.cc',
       'browser_accessibility.cc',
       'browser_accessibility_manager.cc',
       'chrome_plugin_host.cc',