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

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

Issue 2447523002: [ash-md] Added different highlighting modes to the InkDropImpl. (Closed)
Patch Set: Fixed compile errors. Created 4 years, 1 month 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_ACTION_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" 10 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
11 #include "ui/views/context_menu_controller.h" 11 #include "ui/views/context_menu_controller.h"
12 #include "ui/views/controls/button/menu_button.h" 12 #include "ui/views/controls/button/menu_button.h"
13 #include "ui/views/controls/button/menu_button_listener.h" 13 #include "ui/views/controls/button/menu_button_listener.h"
14 #include "ui/views/controls/menu/menu_model_adapter.h" 14 #include "ui/views/controls/menu/menu_model_adapter.h"
15 #include "ui/views/drag_controller.h" 15 #include "ui/views/drag_controller.h"
16 #include "ui/views/view.h" 16 #include "ui/views/view.h"
17 17
18 class ExtensionAction; 18 class ExtensionAction;
19 19
20 namespace extensions { 20 namespace extensions {
21 class Extension; 21 class Extension;
22 } 22 }
23 23
24 namespace gfx { 24 namespace gfx {
25 class Image; 25 class Image;
26 } 26 }
27 27
28 namespace views { 28 namespace views {
29 class InkDrop;
29 class MenuItemView; 30 class MenuItemView;
30 class MenuModelAdapter; 31 class MenuModelAdapter;
31 class MenuRunner; 32 class MenuRunner;
32 } 33 }
33 34
34 //////////////////////////////////////////////////////////////////////////////// 35 ////////////////////////////////////////////////////////////////////////////////
35 // ToolbarActionView 36 // ToolbarActionView
36 // A wrapper around a ToolbarActionViewController to display a toolbar action 37 // A wrapper around a ToolbarActionViewController to display a toolbar action
37 // action in the BrowserActionsContainer. 38 // action in the BrowserActionsContainer.
38 class ToolbarActionView : public views::MenuButton, 39 class ToolbarActionView : public views::MenuButton,
(...skipping 28 matching lines...) Expand all
67 ToolbarActionView(ToolbarActionViewController* view_controller, 68 ToolbarActionView(ToolbarActionViewController* view_controller,
68 Delegate* delegate); 69 Delegate* delegate);
69 ~ToolbarActionView() override; 70 ~ToolbarActionView() override;
70 71
71 // views::MenuButton: 72 // views::MenuButton:
72 void GetAccessibleState(ui::AXViewState* state) override; 73 void GetAccessibleState(ui::AXViewState* state) override;
73 std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder() 74 std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder()
74 const override; 75 const override;
75 bool IsTriggerableEvent(const ui::Event& event) override; 76 bool IsTriggerableEvent(const ui::Event& event) override;
76 SkColor GetInkDropBaseColor() const override; 77 SkColor GetInkDropBaseColor() const override;
77 bool ShouldShowInkDropHighlight() const override; 78 std::unique_ptr<views::InkDrop> CreateInkDrop() override;
78 79
79 // ToolbarActionViewDelegateViews: 80 // ToolbarActionViewDelegateViews:
80 content::WebContents* GetCurrentWebContents() const override; 81 content::WebContents* GetCurrentWebContents() const override;
81 void UpdateState() override; 82 void UpdateState() override;
82 83
83 // views::MenuButtonListener: 84 // views::MenuButtonListener:
84 void OnMenuButtonClicked(views::MenuButton* source, 85 void OnMenuButtonClicked(views::MenuButton* source,
85 const gfx::Point& point, 86 const gfx::Point& point,
86 const ui::Event* event) override; 87 const ui::Event* event) override;
87 88
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 161
161 // The time the popup was last closed. 162 // The time the popup was last closed.
162 base::TimeTicks popup_closed_time_; 163 base::TimeTicks popup_closed_time_;
163 164
164 base::WeakPtrFactory<ToolbarActionView> weak_factory_; 165 base::WeakPtrFactory<ToolbarActionView> weak_factory_;
165 166
166 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); 167 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
167 }; 168 };
168 169
169 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 170 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698