Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Unified Diff: trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

Issue 416903002: Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc (revision 285300)
+++ trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc (working copy)
@@ -181,17 +181,21 @@
views::MenuItemView* menu,
int* formats,
std::set<OSExchangeData::CustomFormat>* custom_formats) {
- return BrowserActionDragData::GetDropFormats(custom_formats);
+ custom_formats->insert(BrowserActionDragData::GetBrowserActionCustomFormat());
+ return true;
}
bool BrowserActionOverflowMenuController::AreDropTypesRequired(
views::MenuItemView* menu) {
- return BrowserActionDragData::AreDropTypesRequired();
+ return true;
}
bool BrowserActionOverflowMenuController::CanDrop(
views::MenuItemView* menu, const OSExchangeData& data) {
- return BrowserActionDragData::CanDrop(data, owner_->profile());
+ BrowserActionDragData drop_data;
+ if (!drop_data.Read(data))
+ return false;
+ return drop_data.IsFromProfile(owner_->profile());
}
int BrowserActionOverflowMenuController::GetDropOperation(

Powered by Google App Engine
This is Rietveld 408576698