| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 Delegate* delegate); | 71 Delegate* delegate); |
| 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 ShouldEnterPushedState(const ui::Event& event) override; | 78 bool ShouldEnterPushedState(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 bool ShouldShowInkDropHover() const override; |
| 81 | 82 |
| 82 // ToolbarActionViewDelegateViews: | 83 // ToolbarActionViewDelegateViews: |
| 83 content::WebContents* GetCurrentWebContents() const override; | 84 content::WebContents* GetCurrentWebContents() const override; |
| 84 void UpdateState() override; | 85 void UpdateState() override; |
| 85 | 86 |
| 86 // views::MenuButtonListener: | 87 // views::MenuButtonListener: |
| 87 void OnMenuButtonClicked(views::View* sender, | 88 void OnMenuButtonClicked(views::View* sender, |
| 88 const gfx::Point& point) override; | 89 const gfx::Point& point) override; |
| 89 | 90 |
| 90 ToolbarActionViewController* view_controller() { | 91 ToolbarActionViewController* view_controller() { |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 base::TimeTicks popup_closed_time_; | 168 base::TimeTicks popup_closed_time_; |
| 168 | 169 |
| 169 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; | 170 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
| 170 | 171 |
| 171 base::WeakPtrFactory<ToolbarActionView> weak_factory_; | 172 base::WeakPtrFactory<ToolbarActionView> weak_factory_; |
| 172 | 173 |
| 173 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); | 174 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); |
| 174 }; | 175 }; |
| 175 | 176 |
| 176 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ | 177 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ |
| OLD | NEW |