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

Unified Diff: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h

Issue 597783002: Make the chevron menu button responsible for legacy overflow menu logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h
diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h
deleted file mode 100644
index 069bcf5729da8c9acdb5945d4e20d679b1ac1d1f..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h
+++ /dev/null
@@ -1,133 +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.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
-#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
-
-#include <set>
-#include <vector>
-
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
-#include "base/sequenced_task_runner_helpers.h"
-#include "ui/views/controls/menu/menu_delegate.h"
-
-class Browser;
-class BrowserActionsContainer;
-class BrowserActionView;
-class IconUpdater;
-
-namespace views {
-class MenuRunner;
-class Widget;
-}
-
-// This class handles the overflow menu for browser actions (showing the menu,
-// drag and drop, etc). This class manages its own lifetime.
-class BrowserActionOverflowMenuController : public views::MenuDelegate {
- public:
- // The observer is notified prior to the menu being deleted.
- class Observer {
- public:
- virtual void NotifyMenuDeleted(
- BrowserActionOverflowMenuController* controller) = 0;
- };
-
- BrowserActionOverflowMenuController(
- BrowserActionsContainer* owner,
- Browser* browser,
- views::MenuButton* menu_button,
- const std::vector<BrowserActionView*>& views,
- int start_index,
- bool for_drop);
-
- void set_observer(Observer* observer) { observer_ = observer; }
-
- // Shows the overflow menu.
- bool RunMenu(views::Widget* widget);
-
- // Closes the overflow menu (and its context menu if open as well).
- void CancelMenu();
-
- // Notify the menu that the associated BrowserActionViews have been deleted.
- void NotifyBrowserActionViewsDeleting();
-
- // Overridden from views::MenuDelegate:
- virtual bool IsCommandEnabled(int id) const OVERRIDE;
- virtual void ExecuteCommand(int id) OVERRIDE;
- virtual bool ShowContextMenu(views::MenuItemView* source,
- int id,
- const gfx::Point& p,
- ui::MenuSourceType source_type) OVERRIDE;
- virtual void DropMenuClosed(views::MenuItemView* menu) OVERRIDE;
- // These drag functions offer support for dragging icons into the overflow
- // menu.
- virtual bool GetDropFormats(
- views::MenuItemView* menu,
- int* formats,
- std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
- virtual bool AreDropTypesRequired(views::MenuItemView* menu) OVERRIDE;
- virtual bool CanDrop(views::MenuItemView* menu,
- const ui::OSExchangeData& data) OVERRIDE;
- virtual int GetDropOperation(views::MenuItemView* item,
- const ui::DropTargetEvent& event,
- DropPosition* position) OVERRIDE;
- virtual int OnPerformDrop(views::MenuItemView* menu,
- DropPosition position,
- const ui::DropTargetEvent& event) OVERRIDE;
- // These three drag functions offer support for dragging icons out of the
- // overflow menu.
- virtual bool CanDrag(views::MenuItemView* menu) OVERRIDE;
- virtual void WriteDragData(views::MenuItemView* sender,
- ui::OSExchangeData* data) OVERRIDE;
- virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE;
-
- private:
- // This class manages its own lifetime.
- virtual ~BrowserActionOverflowMenuController();
-
- // Returns the offset into |views_| for the given |id|.
- size_t IndexForId(int id) const;
-
- // A pointer to the browser action container that owns the overflow menu.
- BrowserActionsContainer* owner_;
-
- Browser* browser_;
-
- // The observer, may be null.
- Observer* observer_;
-
- // A pointer to the overflow menu button that we are showing the menu for.
- views::MenuButton* menu_button_;
-
- // The overflow menu for the menu button. Owned by |menu_runner_|.
- views::MenuItemView* menu_;
-
- // Resposible for running the menu.
- scoped_ptr<views::MenuRunner> menu_runner_;
-
- // The views vector of all the browser actions the container knows about. We
- // won't show all items, just the one starting at |start_index| and above.
- // Owned by |owner_|.
- const std::vector<BrowserActionView*>& views_;
-
- // The index into the BrowserActionView vector, indicating where to start
- // picking browser actions to draw.
- int start_index_;
-
- // Whether this controller is being used for drop.
- bool for_drop_;
-
- // The vector keeps all icon updaters associated with menu item views in the
- // controller. The icon updater will update the menu item view's icon when
- // the browser action view's icon has been updated.
- ScopedVector<IconUpdater> icon_updaters_;
-
- friend class base::DeleteHelper<BrowserActionOverflowMenuController>;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserActionOverflowMenuController);
-};
-
-#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698