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

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

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 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 void AnimationProgressed(const gfx::Animation* animation) override; 71 void AnimationProgressed(const gfx::Animation* animation) override;
72 void AnimationCanceled(const gfx::Animation* animation) override; 72 void AnimationCanceled(const gfx::Animation* animation) override;
73 73
74 // views::View: 74 // views::View:
75 const char* GetClassName() const override; 75 const char* GetClassName() const override;
76 void OnBoundsChanged(const gfx::Rect& previous_bounds) override; 76 void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
77 bool OnMousePressed(const ui::MouseEvent& event) override; 77 bool OnMousePressed(const ui::MouseEvent& event) override;
78 void OnMouseReleased(const ui::MouseEvent& event) override; 78 void OnMouseReleased(const ui::MouseEvent& event) override;
79 bool OnKeyPressed(const ui::KeyEvent& event) override; 79 bool OnKeyPressed(const ui::KeyEvent& event) override;
80 void OnGestureEvent(ui::GestureEvent* event) override; 80 void OnGestureEvent(ui::GestureEvent* event) override;
81 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
82 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
83 scoped_ptr<views::InkDropHover> CreateInkDropHover() const override;
84 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override; 81 void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
85 82
86 // views::WidgetObserver: 83 // views::WidgetObserver:
87 void OnWidgetDestroying(views::Widget* widget) override; 84 void OnWidgetDestroying(views::Widget* widget) override;
88 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override; 85 void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override;
89 86
90 void OnClick(); 87 void OnClick();
91 88
92 void UpdateImage(); 89 void UpdateImage();
93 90
(...skipping 12 matching lines...) Expand all
106 // the bubble from reshowing. 103 // the bubble from reshowing.
107 bool suppress_mouse_released_action_; 104 bool suppress_mouse_released_action_;
108 105
109 // Animation delegate for the ink drop ripple effect. 106 // Animation delegate for the ink drop ripple effect.
110 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; 107 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
111 108
112 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView); 109 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);
113 }; 110 };
114 111
115 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 112 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698