Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/scoped_observer.h" | 9 #include "base/scoped_observer.h" |
| 10 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h" | 10 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h" |
| 11 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 12 | 12 |
| 13 class Browser; | 13 class Browser; |
| 14 class BrowserActionsContainer; | 14 class BrowserActionsContainer; |
| 15 class WrenchMenu; | 15 class WrenchMenu; |
| 16 | 16 |
| 17 // ExtensionToolbarMenuView is the view containing the extension actions that | 17 // ExtensionToolbarMenuView is the view containing the extension actions that |
| 18 // overflowed from the BrowserActionsContainer, and is contained in and owned by | 18 // overflowed from the BrowserActionsContainer, and is contained in and owned by |
| 19 // the wrench menu. | 19 // the wrench menu. |
| 20 // In the event that the WrenchMenu was opened for an Extension Action drag-and- | 20 // In the event that the WrenchMenu was opened for an Extension Action drag-and- |
| 21 // drop, this will also close the menu upon completion. | 21 // drop, this will also close the menu upon completion. |
| 22 class ExtensionToolbarMenuView : public views::View, | 22 class ExtensionToolbarMenuView : public views::View, |
| 23 public BrowserActionsContainerObserver { | 23 public BrowserActionsContainerObserver { |
| 24 public: | 24 public: |
| 25 ExtensionToolbarMenuView(Browser* browser, WrenchMenu* wrench_menu); | 25 ExtensionToolbarMenuView(Browser* browser, WrenchMenu* wrench_menu); |
| 26 virtual ~ExtensionToolbarMenuView(); | 26 virtual ~ExtensionToolbarMenuView(); |
| 27 | 27 |
| 28 // Returns true the wrench menu should show this view. | |
|
Peter Kasting
2014/09/16 21:40:55
Nit: true -> whether
Consider explaining when thi
Devlin
2014/09/16 21:58:29
Done.
| |
| 29 bool ShouldShow(); | |
| 30 | |
| 28 // views::View: | 31 // views::View: |
| 29 virtual gfx::Size GetPreferredSize() const OVERRIDE; | 32 virtual gfx::Size GetPreferredSize() const OVERRIDE; |
| 30 virtual int GetHeightForWidth(int width) const OVERRIDE; | 33 virtual int GetHeightForWidth(int width) const OVERRIDE; |
| 31 virtual void Layout() OVERRIDE; | 34 virtual void Layout() OVERRIDE; |
| 32 | 35 |
| 33 private: | 36 private: |
| 34 // BrowserActionsContainerObserver: | 37 // BrowserActionsContainerObserver: |
| 35 virtual void OnBrowserActionDragDone() OVERRIDE; | 38 virtual void OnBrowserActionDragDone() OVERRIDE; |
| 36 | 39 |
| 37 // Closes the |wrench_menu_|. | 40 // Closes the |wrench_menu_|. |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 48 | 51 |
| 49 ScopedObserver<BrowserActionsContainer, BrowserActionsContainerObserver> | 52 ScopedObserver<BrowserActionsContainer, BrowserActionsContainerObserver> |
| 50 browser_actions_container_observer_; | 53 browser_actions_container_observer_; |
| 51 | 54 |
| 52 base::WeakPtrFactory<ExtensionToolbarMenuView> weak_factory_; | 55 base::WeakPtrFactory<ExtensionToolbarMenuView> weak_factory_; |
| 53 | 56 |
| 54 DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarMenuView); | 57 DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarMenuView); |
| 55 }; | 58 }; |
| 56 | 59 |
| 57 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ | 60 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ |
| OLD | NEW |