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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Update the behavior Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
index d2b7de509ee17537b0bc4857ed66346d2077fcf7..b163dff8f48eb545de79edda9862efeca28eafcc 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
@@ -15,7 +15,6 @@
#include "ui/gfx/animation/slide_animation.h"
#include "ui/views/painter.h"
#include "ui/views/view.h"
-#include "ui/views/widget/widget_observer.h"
class ContentSettingImageModel;
class LocationBarView;
@@ -36,8 +35,7 @@ class BubbleDialogDelegateView;
// various content settings affordances in the location bar (i.e. plugin
// blocking, geolocation).
class ContentSettingImageView : public IconLabelBubbleView,
- public gfx::AnimationDelegate,
- public views::WidgetObserver {
+ public gfx::AnimationDelegate {
public:
ContentSettingImageView(std::unique_ptr<ContentSettingImageModel> image_model,
LocationBarView* parent,
@@ -54,6 +52,7 @@ class ContentSettingImageView : public IconLabelBubbleView,
// IconLabelBubbleView:
const char* GetClassName() const override;
+ bool IsInkDropEnabled() const override;
void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
bool OnMousePressed(const ui::MouseEvent& event) override;
void OnMouseReleased(const ui::MouseEvent& event) override;
@@ -61,7 +60,6 @@ class ContentSettingImageView : public IconLabelBubbleView,
bool GetTooltipText(const gfx::Point& p,
base::string16* tooltip) const override;
void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
- std::unique_ptr<views::InkDrop> CreateInkDrop() override;
SkColor GetTextColor() const override;
bool ShouldShowLabel() const override;
double WidthMultiplier() const override;

Powered by Google App Engine
This is Rietveld 408576698