Wires up drag and drop for bookmark menus and cleans up a couple of...

views/controls/menu/menu_controller.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/menu_controller.h"
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "base/keyboard_codes.h"
 #include "base/time.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/drag_utils.h"
+#include "views/screen.h"
 #include "views/view_constants.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 using base::Time;
 using base::TimeDelta;
 
 // Period of the scroll timer (in milliseconds).
 static const int kScrollTimerMS = 30;
 
@@ skipping 144 matching lines @@
   state_ = State();
   pending_state_.initial_bounds = bounds;
   if (bounds.height() > 1) {
     // Inset the bounds slightly, otherwise drag coordinates don't line up
     // nicely and menus close prematurely.
     pending_state_.initial_bounds.Inset(0, 1);
   }
   pending_state_.anchor = position;
   owner_ = parent;
 
-  // TODO: push this into Screen.
   // Calculate the bounds of the monitor we'll show menus on. Do this once to
   // avoid repeated system queries for the info.
-#if defined(OS_WIN)
-  POINT initial_loc = { bounds.x(), bounds.y() };
-  HMONITOR monitor = MonitorFromPoint(initial_loc, MONITOR_DEFAULTTONEAREST);
-  if (monitor) {
-    MONITORINFO mi = {0};
-    mi.cbSize = sizeof(mi);
-    GetMonitorInfo(monitor, &mi);
-    // Menus appear over the taskbar.
-    pending_state_.monitor_bounds = gfx::Rect(mi.rcMonitor);
-  }
-#else
-  NOTIMPLEMENTED();
-#endif
+  pending_state_.monitor_bounds = Screen::GetMonitorAreaNearestPoint(
+      bounds.origin());
 
   // Set the selection, which opens the initial menu.
   SetSelection(root, true, true);
 
   if (!blocking_run_) {
     // Start the timer to hide the menu. This is needed as we get no
     // notification when the drag has finished.
     StartCancelAllTimer();
     return NULL;
   }
@@ skipping 284 matching lines @@
     SetSelection(pending_state_.item->GetParentMenuItem(), true, false);
   }
 }
 
 void MenuController::OnMouseEntered(SubmenuView* source,
                                     const MouseEvent& event) {
   // MouseEntered is always followed by a mouse moved, so don't need to
   // do anything here.
 }
 
+bool MenuController::GetDropFormats(
+      SubmenuView* source,
+      int* formats,
+      std::set<OSExchangeData::CustomFormat>* custom_formats) {
+  return source->GetMenuItem()->GetDelegate()->GetDropFormats(
+      source->GetMenuItem(), formats, custom_formats);
+}
+
+bool MenuController::AreDropTypesRequired(SubmenuView* source) {
+  return source->GetMenuItem()->GetDelegate()->AreDropTypesRequired(
+      source->GetMenuItem());
+}
+
 bool MenuController::CanDrop(SubmenuView* source, const OSExchangeData& data) {
   return source->GetMenuItem()->GetDelegate()->CanDrop(source->GetMenuItem(),
                                                        data);
 }
 
 void MenuController::OnDragEntered(SubmenuView* source,
                                    const DropTargetEvent& event) {
   valid_drop_coordinates_ = false;
 }
 
@@ skipping 893 matching lines @@
   if (!scroll_task_.get())
     scroll_task_.reset(new MenuScrollTask());
   scroll_task_->Update(part);
 }
 
 void MenuController::StopScrolling() {
   scroll_task_.reset(NULL);
 }
 
 }  // namespace views