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

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

Issue 2033553003: Add MD ink drop ripple to shelf app items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TODO Created 4 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TOOLBAR_BUTTON_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/gfx/geometry/point.h" 11 #include "ui/gfx/geometry/point.h"
12 #include "ui/views/context_menu_controller.h" 12 #include "ui/views/context_menu_controller.h"
13 #include "ui/views/controls/button/button.h" 13 #include "ui/views/controls/button/button.h"
14 #include "ui/views/controls/button/label_button.h" 14 #include "ui/views/controls/button/label_button.h"
15 15
16 class Profile; 16 class Profile;
17 17
18 namespace test { 18 namespace test {
19 class ToolbarButtonTestApi; 19 class ToolbarButtonTestApi;
20 } 20 }
21 21
22 namespace ui { 22 namespace ui {
23 class MenuModel; 23 class MenuModel;
24 } 24 }
25 25
26 namespace views { 26 namespace views {
27 class InkDropDelegate;
28 class MenuModelAdapter; 27 class MenuModelAdapter;
29 class MenuRunner; 28 class MenuRunner;
30 } 29 }
31 30
32 // This class provides basic drawing and mouse-over behavior for buttons 31 // This class provides basic drawing and mouse-over behavior for buttons
33 // appearing in the toolbar. 32 // appearing in the toolbar.
34 class ToolbarButton : public views::LabelButton, 33 class ToolbarButton : public views::LabelButton,
35 public views::ContextMenuController { 34 public views::ContextMenuController {
36 public: 35 public:
37 // Takes ownership of the |model|, which can be null if no menu 36 // Takes ownership of the |model|, which can be null if no menu
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // Menu runner to display drop down menu. 100 // Menu runner to display drop down menu.
102 std::unique_ptr<views::MenuRunner> menu_runner_; 101 std::unique_ptr<views::MenuRunner> menu_runner_;
103 102
104 // A factory for tasks that show the dropdown context menu for the button. 103 // A factory for tasks that show the dropdown context menu for the button.
105 base::WeakPtrFactory<ToolbarButton> show_menu_factory_; 104 base::WeakPtrFactory<ToolbarButton> show_menu_factory_;
106 105
107 DISALLOW_COPY_AND_ASSIGN(ToolbarButton); 106 DISALLOW_COPY_AND_ASSIGN(ToolbarButton);
108 }; 107 };
109 108
110 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ 109 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu_button.h ('k') | ui/views/animation/ink_drop_host_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698