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

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

Issue 1752553002: [MD] Fix some ink drop colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 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 69
70 ToolbarActionView(ToolbarActionViewController* view_controller, 70 ToolbarActionView(ToolbarActionViewController* view_controller,
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 IsTriggerableEvent(const ui::Event& event) override; 78 bool IsTriggerableEvent(const ui::Event& event) override;
79 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
80 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
81 SkColor GetInkDropBaseColor() const override; 79 SkColor GetInkDropBaseColor() const override;
82 bool ShouldShowInkDropHover() const override; 80 bool ShouldShowInkDropHover() const override;
83 81
84 // ToolbarActionViewDelegateViews: 82 // ToolbarActionViewDelegateViews:
85 content::WebContents* GetCurrentWebContents() const override; 83 content::WebContents* GetCurrentWebContents() const override;
86 void UpdateState() override; 84 void UpdateState() override;
87 85
88 // views::MenuButtonListener: 86 // views::MenuButtonListener:
89 void OnMenuButtonClicked(views::MenuButton* source, 87 void OnMenuButtonClicked(views::MenuButton* source,
90 const gfx::Point& point, 88 const gfx::Point& point,
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 base::TimeTicks popup_closed_time_; 168 base::TimeTicks popup_closed_time_;
171 169
172 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; 170 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
173 171
174 base::WeakPtrFactory<ToolbarActionView> weak_factory_; 172 base::WeakPtrFactory<ToolbarActionView> weak_factory_;
175 173
176 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); 174 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
177 }; 175 };
178 176
179 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 177 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698