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

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

Issue 2034963002: Rename InkDropHover to InkDropHighlight (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: relative patchset 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_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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 ToolbarActionView(ToolbarActionViewController* view_controller, 67 ToolbarActionView(ToolbarActionViewController* view_controller,
68 Delegate* delegate); 68 Delegate* delegate);
69 ~ToolbarActionView() override; 69 ~ToolbarActionView() override;
70 70
71 // views::MenuButton: 71 // views::MenuButton:
72 void GetAccessibleState(ui::AXViewState* state) override; 72 void GetAccessibleState(ui::AXViewState* state) override;
73 std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder() 73 std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder()
74 const override; 74 const override;
75 bool IsTriggerableEvent(const ui::Event& event) override; 75 bool IsTriggerableEvent(const ui::Event& event) override;
76 SkColor GetInkDropBaseColor() const override; 76 SkColor GetInkDropBaseColor() const override;
77 bool ShouldShowInkDropHover() const override; 77 bool ShouldShowInkDropHighlight() const override;
78 78
79 // ToolbarActionViewDelegateViews: 79 // ToolbarActionViewDelegateViews:
80 content::WebContents* GetCurrentWebContents() const override; 80 content::WebContents* GetCurrentWebContents() const override;
81 void UpdateState() override; 81 void UpdateState() override;
82 82
83 // views::MenuButtonListener: 83 // views::MenuButtonListener:
84 void OnMenuButtonClicked(views::MenuButton* source, 84 void OnMenuButtonClicked(views::MenuButton* source,
85 const gfx::Point& point, 85 const gfx::Point& point,
86 const ui::Event* event) override; 86 const ui::Event* event) override;
87 87
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 // The time the popup was last closed. 164 // The time the popup was last closed.
165 base::TimeTicks popup_closed_time_; 165 base::TimeTicks popup_closed_time_;
166 166
167 base::WeakPtrFactory<ToolbarActionView> weak_factory_; 167 base::WeakPtrFactory<ToolbarActionView> weak_factory_;
168 168
169 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); 169 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
170 }; 170 };
171 171
172 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 172 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698