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

Side by Side Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.h

Issue 1682893002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit tests 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 void OnMouseReleased(const ui::MouseEvent& event) override; 81 void OnMouseReleased(const ui::MouseEvent& event) override;
82 bool OnKeyPressed(const ui::KeyEvent& event) override; 82 bool OnKeyPressed(const ui::KeyEvent& event) override;
83 void OnGestureEvent(ui::GestureEvent* event) override; 83 void OnGestureEvent(ui::GestureEvent* event) override;
84 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override; 84 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
85 85
86 // views::InkDropHost: 86 // views::InkDropHost:
87 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 87 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
88 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 88 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
89 gfx::Point CalculateInkDropCenter() const override; 89 gfx::Point CalculateInkDropCenter() const override;
90 bool ShouldShowInkDropHover() const override; 90 bool ShouldShowInkDropHover() const override;
91 SkColor GetInkDropBaseColor() const override;
91 92
92 // views::WidgetObserver: 93 // views::WidgetObserver:
93 void OnWidgetDestroying(views::Widget* widget) override; 94 void OnWidgetDestroying(views::Widget* widget) override;
94 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override; 95 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override;
95 96
96 void OnClick(); 97 void OnClick();
97 98
98 void UpdateImage(); 99 void UpdateImage();
99 100
100 // Returns true if a related bubble is showing. 101 // Returns true if a related bubble is showing.
(...skipping 11 matching lines...) Expand all
112 // the bubble from reshowing. 113 // the bubble from reshowing.
113 bool suppress_mouse_released_action_; 114 bool suppress_mouse_released_action_;
114 115
115 // Animation delegate for the ink drop ripple effect. 116 // Animation delegate for the ink drop ripple effect.
116 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; 117 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
117 118
118 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView); 119 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);
119 }; 120 };
120 121
121 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 122 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698