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

Side by Side Diff: chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
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"
(...skipping 13 matching lines...) Expand all
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 whether the wrench menu should show this view. This is true when 28 // Returns whether the wrench menu should show this view. This is true when
29 // either |container_| has icons to display or the menu was opened for a drag- 29 // either |container_| has icons to display or the menu was opened for a drag-
30 // and-drop operation. 30 // and-drop operation.
31 bool ShouldShow(); 31 bool ShouldShow();
32 32
33 // views::View: 33 // views::View:
34 virtual gfx::Size GetPreferredSize() const OVERRIDE; 34 virtual gfx::Size GetPreferredSize() const override;
35 virtual int GetHeightForWidth(int width) const OVERRIDE; 35 virtual int GetHeightForWidth(int width) const override;
36 virtual void Layout() OVERRIDE; 36 virtual void Layout() override;
37 37
38 private: 38 private:
39 // BrowserActionsContainerObserver: 39 // BrowserActionsContainerObserver:
40 virtual void OnBrowserActionDragDone() OVERRIDE; 40 virtual void OnBrowserActionDragDone() override;
41 41
42 // Closes the |wrench_menu_|. 42 // Closes the |wrench_menu_|.
43 void CloseWrenchMenu(); 43 void CloseWrenchMenu();
44 44
45 // The associated browser. 45 // The associated browser.
46 Browser* browser_; 46 Browser* browser_;
47 47
48 // The WrenchMenu, which may need to be closed after a drag-and-drop. 48 // The WrenchMenu, which may need to be closed after a drag-and-drop.
49 WrenchMenu* wrench_menu_; 49 WrenchMenu* wrench_menu_;
50 50
51 // The overflow BrowserActionsContainer which is nested in this view. 51 // The overflow BrowserActionsContainer which is nested in this view.
52 BrowserActionsContainer* container_; 52 BrowserActionsContainer* container_;
53 53
54 ScopedObserver<BrowserActionsContainer, BrowserActionsContainerObserver> 54 ScopedObserver<BrowserActionsContainer, BrowserActionsContainerObserver>
55 browser_actions_container_observer_; 55 browser_actions_container_observer_;
56 56
57 base::WeakPtrFactory<ExtensionToolbarMenuView> weak_factory_; 57 base::WeakPtrFactory<ExtensionToolbarMenuView> weak_factory_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarMenuView); 59 DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarMenuView);
60 }; 60 };
61 61
62 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ 62 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/chevron_menu_button.cc ('k') | chrome/browser/ui/views/toolbar/home_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698