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

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

Issue 2914043002: Changed extension buttons to use a flood-fill ripple when in the chrome menu. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/toolbar_action_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ToolbarActionView(ToolbarActionViewController* view_controller, 57 ToolbarActionView(ToolbarActionViewController* view_controller,
58 Delegate* delegate); 58 Delegate* delegate);
59 ~ToolbarActionView() override; 59 ~ToolbarActionView() override;
60 60
61 // views::MenuButton: 61 // views::MenuButton:
62 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; 62 void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
63 std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder() 63 std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder()
64 const override; 64 const override;
65 bool IsTriggerableEvent(const ui::Event& event) override; 65 bool IsTriggerableEvent(const ui::Event& event) override;
66 SkColor GetInkDropBaseColor() const override; 66 SkColor GetInkDropBaseColor() const override;
67 bool ShouldUseFloodFillInkDrop() const override;
67 std::unique_ptr<views::InkDrop> CreateInkDrop() override; 68 std::unique_ptr<views::InkDrop> CreateInkDrop() override;
68 69
69 // ToolbarActionViewDelegateViews: 70 // ToolbarActionViewDelegateViews:
70 content::WebContents* GetCurrentWebContents() const override; 71 content::WebContents* GetCurrentWebContents() const override;
71 void UpdateState() override; 72 void UpdateState() override;
72 73
73 // views::MenuButtonListener: 74 // views::MenuButtonListener:
74 void OnMenuButtonClicked(views::MenuButton* source, 75 void OnMenuButtonClicked(views::MenuButton* source,
75 const gfx::Point& point, 76 const gfx::Point& point,
76 const ui::Event* event) override; 77 const ui::Event* event) override;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 151
151 // The time the popup was last closed. 152 // The time the popup was last closed.
152 base::TimeTicks popup_closed_time_; 153 base::TimeTicks popup_closed_time_;
153 154
154 base::WeakPtrFactory<ToolbarActionView> weak_factory_; 155 base::WeakPtrFactory<ToolbarActionView> weak_factory_;
155 156
156 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); 157 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
157 }; 158 };
158 159
159 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 160 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/toolbar_action_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698