Make the chevron menu button responsible for legacy overflow menu logic

chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
deleted file mode 100644
index 86009f91d94d136157c33f46d53d95439387ff3a..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright (c) 2012 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 "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h"
-
-#include "base/message_loop/message_loop.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_action.h"
-#include "chrome/browser/extensions/extension_context_menu_model.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
-#include "chrome/browser/ui/views/toolbar/browser_action_view.h"
-#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
-#include "extensions/browser/extension_registry.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/extension_set.h"
-#include "ui/views/controls/menu/menu_item_view.h"
-#include "ui/views/controls/menu/menu_runner.h"
-
-// In the browser actions container's chevron menu, a menu item view's icon
-// comes from BrowserActionView::GetIconWithBadge() when the menu item view is
-// created. But, the browser action's icon may not be loaded in time because it
-// is read from file system in another thread.
-// The IconUpdater will update the menu item view's icon when the browser
-// action's icon has been updated.
-class IconUpdater : public BrowserActionView::IconObserver {
- public:
-  IconUpdater(views::MenuItemView* menu_item_view, BrowserActionView* view)
-      : menu_item_view_(menu_item_view),
-        view_(view) {
-    DCHECK(menu_item_view);
-    DCHECK(view);
-    view->set_icon_observer(this);
-  }
-  virtual ~IconUpdater() {
-    view_->set_icon_observer(NULL);
-  }
-
-  // Overridden from BrowserActionView::IconObserver:
-  virtual void OnIconUpdated(const gfx::ImageSkia& icon) OVERRIDE {
-    menu_item_view_->SetIcon(icon);
-  }
-
- private:
-  // The menu item view whose icon might be updated.
-  views::MenuItemView* menu_item_view_;
-
-  // The view to be observed. When its icon changes, update the corresponding
-  // menu item view's icon.
-  BrowserActionView* view_;
-
-  DISALLOW_COPY_AND_ASSIGN(IconUpdater);
-};
-
-BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(
-    BrowserActionsContainer* owner,
-    Browser* browser,
-    views::MenuButton* menu_button,
-    const std::vector<BrowserActionView*>& views,
-    int start_index,
-    bool for_drop)
-    : owner_(owner),
-      browser_(browser),
-      observer_(NULL),
-      menu_button_(menu_button),
-      menu_(NULL),
-      views_(views),
-      start_index_(start_index),
-      for_drop_(for_drop) {
-  menu_ = new views::MenuItemView(this);
-  menu_runner_.reset(new views::MenuRunner(
-      menu_, for_drop_ ? views::MenuRunner::FOR_DROP : 0));
-  menu_->set_has_icons(true);
-
-  size_t command_id = 1;  // Menu id 0 is reserved, start with 1.
-  for (size_t i = start_index; i < views_.size(); ++i) {
-    BrowserActionView* view = views_[i];
-    views::MenuItemView* menu_item = menu_->AppendMenuItemWithIcon(
-        command_id,
-        base::UTF8ToUTF16(view->extension()->name()),
-        view->GetIconWithBadge());
-
-    // Set the tooltip for this item.
-    base::string16 tooltip = base::UTF8ToUTF16(
-        view->extension_action()->GetTitle(
-            view->view_controller()->GetCurrentTabId()));
-    menu_->SetTooltip(tooltip, command_id);
-
-    icon_updaters_.push_back(new IconUpdater(menu_item, view));
-
-    ++command_id;
-  }
-}
-
-BrowserActionOverflowMenuController::~BrowserActionOverflowMenuController() {
-  if (observer_)
-    observer_->NotifyMenuDeleted(this);
-}
-
-bool BrowserActionOverflowMenuController::RunMenu(views::Widget* window) {
-  gfx::Rect bounds = menu_button_->bounds();
-  gfx::Point screen_loc;
-  views::View::ConvertPointToScreen(menu_button_, &screen_loc);
-  bounds.set_x(screen_loc.x());
-  bounds.set_y(screen_loc.y());
-
-  views::MenuAnchorPosition anchor = views::MENU_ANCHOR_TOPRIGHT;
-  // As we maintain our own lifetime we can safely ignore the result.
-  ignore_result(menu_runner_->RunMenuAt(
-      window, menu_button_, bounds, anchor, ui::MENU_SOURCE_NONE));
-  if (!for_drop_) {
-    // Give the context menu (if any) a chance to execute the user-selected
-    // command.
-    base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-  }
-  return true;
-}
-
-void BrowserActionOverflowMenuController::CancelMenu() {
-  menu_->Cancel();
-}
-
-void BrowserActionOverflowMenuController::NotifyBrowserActionViewsDeleting() {
-  icon_updaters_.clear();
-}
-
-bool BrowserActionOverflowMenuController::IsCommandEnabled(int id) const {
-  BrowserActionView* view = views_[start_index_ + id - 1];
-  return view->IsEnabled(view->view_controller()->GetCurrentTabId());
-}
-
-void BrowserActionOverflowMenuController::ExecuteCommand(int id) {
-  views_[start_index_ + id - 1]->view_controller()->ExecuteActionByUser();
-}
-
-bool BrowserActionOverflowMenuController::ShowContextMenu(
-    views::MenuItemView* source,
-    int id,
-    const gfx::Point& p,
-    ui::MenuSourceType source_type) {
-  BrowserActionView* view = views_[start_index_ + id - 1];
-  if (!view->extension()->ShowConfigureContextMenus())
-    return false;
-
-  scoped_refptr<ExtensionContextMenuModel> context_menu_contents =
-      new ExtensionContextMenuModel(
-          view->extension(), browser_, view->view_controller());
-  views::MenuRunner context_menu_runner(context_menu_contents.get(),
-                                        views::MenuRunner::HAS_MNEMONICS |
-                                            views::MenuRunner::IS_NESTED |
-                                            views::MenuRunner::CONTEXT_MENU);
-
-  // We can ignore the result as we delete ourself.
-  // This blocks until the user choses something or dismisses the menu.
-  ignore_result(context_menu_runner.RunMenuAt(menu_button_->GetWidget(),
-                                              NULL,
-                                              gfx::Rect(p, gfx::Size()),
-                                              views::MENU_ANCHOR_TOPLEFT,
-                                              source_type));
-
-  // The user is done with the context menu, so we can close the underlying
-  // menu.
-  menu_->Cancel();
-
-  return true;
-}
-
-void BrowserActionOverflowMenuController::DropMenuClosed(
-    views::MenuItemView* menu) {
-  delete this;
-}
-
-bool BrowserActionOverflowMenuController::GetDropFormats(
-    views::MenuItemView* menu,
-    int* formats,
-    std::set<OSExchangeData::CustomFormat>* custom_formats) {
-  return BrowserActionDragData::GetDropFormats(custom_formats);
-}
-
-bool BrowserActionOverflowMenuController::AreDropTypesRequired(
-    views::MenuItemView* menu) {
-  return BrowserActionDragData::AreDropTypesRequired();
-}
-
-bool BrowserActionOverflowMenuController::CanDrop(
-    views::MenuItemView* menu, const OSExchangeData& data) {
-  return BrowserActionDragData::CanDrop(data, owner_->profile());
-}
-
-int BrowserActionOverflowMenuController::GetDropOperation(
-    views::MenuItemView* item,
-    const ui::DropTargetEvent& event,
-    DropPosition* position) {
-  // Don't allow dropping from the BrowserActionContainer into slot 0 of the
-  // overflow menu since once the move has taken place the item you are dragging
-  // falls right out of the menu again once the user releases the button
-  // (because we don't shrink the BrowserActionContainer when you do this).
-  if ((item->GetCommand() == 0) && (*position == DROP_BEFORE)) {
-    BrowserActionDragData drop_data;
-    if (!drop_data.Read(event.data()))
-      return ui::DragDropTypes::DRAG_NONE;
-
-    if (drop_data.index() < owner_->VisibleBrowserActions())
-      return ui::DragDropTypes::DRAG_NONE;
-  }
-
-  return ui::DragDropTypes::DRAG_MOVE;
-}
-
-int BrowserActionOverflowMenuController::OnPerformDrop(
-    views::MenuItemView* menu,
-    DropPosition position,
-    const ui::DropTargetEvent& event) {
-  BrowserActionDragData drop_data;
-  if (!drop_data.Read(event.data()))
-    return ui::DragDropTypes::DRAG_NONE;
-
-  size_t drop_index = IndexForId(menu->GetCommand());
-
-  // When not dragging within the overflow menu (dragging an icon into the menu)
-  // subtract one to get the right index.
-  if (position == DROP_BEFORE &&
-      drop_data.index() < owner_->VisibleBrowserActions())
-    --drop_index;
-
-  // Move the extension in the model.
-  const extensions::Extension* extension =
-      extensions::ExtensionRegistry::Get(browser_->profile())->
-          enabled_extensions().GetByID(drop_data.id());
-  extensions::ExtensionToolbarModel* toolbar_model =
-      extensions::ExtensionToolbarModel::Get(browser_->profile());
-  if (browser_->profile()->IsOffTheRecord())
-    drop_index = toolbar_model->IncognitoIndexToOriginal(drop_index);
-  toolbar_model->MoveExtensionIcon(extension, drop_index);
-
-  // If the extension was moved to the overflow menu from the main bar, notify
-  // the owner.
-  if (drop_data.index() < owner_->VisibleBrowserActions())
-    owner_->NotifyActionMovedToOverflow();
-
-  if (for_drop_)
-    delete this;
-  return ui::DragDropTypes::DRAG_MOVE;
-}
-
-bool BrowserActionOverflowMenuController::CanDrag(views::MenuItemView* menu) {
-  return true;
-}
-
-void BrowserActionOverflowMenuController::WriteDragData(
-    views::MenuItemView* sender, OSExchangeData* data) {
-  size_t drag_index = IndexForId(sender->GetCommand());
-  const extensions::Extension* extension = views_[drag_index]->extension();
-  BrowserActionDragData drag_data(extension->id(), drag_index);
-  drag_data.Write(owner_->profile(), data);
-}
-
-int BrowserActionOverflowMenuController::GetDragOperations(
-    views::MenuItemView* sender) {
-  return ui::DragDropTypes::DRAG_MOVE;
-}
-
-size_t BrowserActionOverflowMenuController::IndexForId(int id) const {
-  // The index of the view being dragged (GetCommand gives a 1-based index into
-  // the overflow menu).
-  DCHECK_GT(owner_->VisibleBrowserActions() + id, 0u);
-  return owner_->VisibleBrowserActions() + id - 1;
-}