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

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

Issue 1661673004: Enables hot-tracking for overflow extension buttons in the app menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restores hot-tracking of extension buttons in app menu with MD Created 4 years, 10 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 Delegate* delegate); 69 Delegate* delegate);
70 ~ToolbarActionView() override; 70 ~ToolbarActionView() override;
71 71
72 // views::MenuButton: 72 // views::MenuButton:
73 void GetAccessibleState(ui::AXViewState* state) override; 73 void GetAccessibleState(ui::AXViewState* state) override;
74 scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override; 74 scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override;
75 void OnMouseEntered(const ui::MouseEvent& event) override; 75 void OnMouseEntered(const ui::MouseEvent& event) override;
76 bool ShouldEnterPushedState(const ui::Event& event) override; 76 bool ShouldEnterPushedState(const ui::Event& event) override;
77 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 77 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
78 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 78 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
79 bool ShouldShowInkDropHover() const override;
79 80
80 // ToolbarActionViewDelegateViews: 81 // ToolbarActionViewDelegateViews:
81 content::WebContents* GetCurrentWebContents() const override; 82 content::WebContents* GetCurrentWebContents() const override;
82 void UpdateState() override; 83 void UpdateState() override;
83 84
84 // views::MenuButtonListener: 85 // views::MenuButtonListener:
85 void OnMenuButtonClicked(views::View* sender, 86 void OnMenuButtonClicked(views::View* sender,
86 const gfx::Point& point) override; 87 const gfx::Point& point) override;
87 88
88 ToolbarActionViewController* view_controller() { 89 ToolbarActionViewController* view_controller() {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 base::TimeTicks popup_closed_time_; 164 base::TimeTicks popup_closed_time_;
164 165
165 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; 166 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
166 167
167 base::WeakPtrFactory<ToolbarActionView> weak_factory_; 168 base::WeakPtrFactory<ToolbarActionView> weak_factory_;
168 169
169 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); 170 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
170 }; 171 };
171 172
172 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 173 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698