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

Unified Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 1724963002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky review 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index fb5165c7f996cc498a6571f53f85fd54d57233c8..24a8b4a569244cf79bec02130d51a8ca5659277b 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -211,24 +211,6 @@ void ContentSettingImageView::OnGestureEvent(ui::GestureEvent* event) {
event->SetHandled();
}
-void ContentSettingImageView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
- image()->SetPaintToLayer(true);
- image()->SetFillsBoundsOpaquely(false);
- IconLabelBubbleView::AddInkDropLayer(ink_drop_layer);
-}
-
-void ContentSettingImageView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
- IconLabelBubbleView::RemoveInkDropLayer(ink_drop_layer);
- image()->SetFillsBoundsOpaquely(true);
- image()->SetPaintToLayer(false);
-}
-
-scoped_ptr<views::InkDropHover> ContentSettingImageView::CreateInkDropHover()
- const {
- // Location bar views don't show hover effect.
- return nullptr;
-}
-
void ContentSettingImageView::OnNativeThemeChanged(
const ui::NativeTheme* native_theme) {
if (ui::MaterialDesignController::IsModeMaterial())

Powered by Google App Engine
This is Rietveld 408576698