OLD | NEW |
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 ~ToolbarActionView() override; | 72 ~ToolbarActionView() override; |
73 | 73 |
74 // views::MenuButton: | 74 // views::MenuButton: |
75 void GetAccessibleState(ui::AXViewState* state) override; | 75 void GetAccessibleState(ui::AXViewState* state) override; |
76 scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override; | 76 scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override; |
77 void OnMouseEntered(const ui::MouseEvent& event) override; | 77 void OnMouseEntered(const ui::MouseEvent& event) override; |
78 bool IsTriggerableEvent(const ui::Event& event) override; | 78 bool IsTriggerableEvent(const ui::Event& event) override; |
79 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; | 79 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; |
80 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; | 80 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; |
81 SkColor GetInkDropBaseColor() const override; | 81 SkColor GetInkDropBaseColor() const override; |
| 82 bool ShouldShowInkDropHover() const override; |
82 | 83 |
83 // ToolbarActionViewDelegateViews: | 84 // ToolbarActionViewDelegateViews: |
84 content::WebContents* GetCurrentWebContents() const override; | 85 content::WebContents* GetCurrentWebContents() const override; |
85 void UpdateState() override; | 86 void UpdateState() override; |
86 | 87 |
87 // views::MenuButtonListener: | 88 // views::MenuButtonListener: |
88 void OnMenuButtonClicked(views::MenuButton* source, | 89 void OnMenuButtonClicked(views::MenuButton* source, |
89 const gfx::Point& point, | 90 const gfx::Point& point, |
90 const ui::Event* event) override; | 91 const ui::Event* event) override; |
91 | 92 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 base::TimeTicks popup_closed_time_; | 170 base::TimeTicks popup_closed_time_; |
170 | 171 |
171 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; | 172 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
172 | 173 |
173 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 174 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
174 | 175 |
175 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 176 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
176 }; | 177 }; |
177 | 178 |
178 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 179 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
OLD | NEW |