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

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

Issue 2348853004: Remove non-md code in location bar (Views). (Closed)
Patch Set: resolve change collision Created 4 years, 3 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 ee2982aaa4983018b5dbbe5f4e0694c5067b2019..de4422627d1e3a2a9c6c8611e9d13fa69ef5ca9f 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
@@ -44,8 +44,7 @@ class ContentSettingImageView : public IconLabelBubbleView,
// ContentSettingImageView takes ownership of its |image_model|.
ContentSettingImageView(ContentSettingImageModel* image_model,
LocationBarView* parent,
- const gfx::FontList& font_list,
- SkColor parent_background_color);
+ const gfx::FontList& font_list);
~ContentSettingImageView() override;
// Updates the decoration from the shown WebContents.
@@ -67,8 +66,7 @@ class ContentSettingImageView : public IconLabelBubbleView,
void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
bool ShouldShowInkDropForFocus() const override;
SkColor GetTextColor() const override;
- SkColor GetBorderColor() const override;
- bool ShouldShowBackground() const override;
+ bool ShouldShowLabel() const override;
double WidthMultiplier() const override;
bool IsShrinking() const override;
bool OnActivate(const ui::Event& event) override;

Powered by Google App Engine
This is Rietveld 408576698