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

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

Issue 1448433004: [MD] update EV bubble icon and location bar https icons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 1 month 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/icon_label_bubble_view.h
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
index 72f0e4ac032b0d2ad4c3177caf81a73d595eb525..b6558fc46bf6ae937543c4d279121a93603723b8 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -79,6 +79,8 @@ class IconLabelBubbleView : public views::View {
const gfx::FontList& font_list() const { return label_->font_list(); }
+ bool IsInvertedColorScheme() const;
+
gfx::Size GetSizeForLabelWidth(int width) const;
private:
@@ -90,9 +92,9 @@ class IconLabelBubbleView : public views::View {
// As above, but for Material Design. TODO(estade): remove/replace the above.
int GetBubbleOuterPaddingMd(bool leading) const;
- // Sets a background color on |label_| based on |background_image_color| and
- // |parent_background_color_|.
- void SetLabelBackgroundColor(SkColor background_image_color);
+ // Sets a background color on |label_| based on |chip_background_color| and
+ // the parent's bg color.
+ void SetLabelBackgroundColor(SkColor chip_background_color);
// views::View:
const char* GetClassName() const override;
@@ -107,6 +109,9 @@ class IconLabelBubbleView : public views::View {
bool is_extension_icon_;
+ // This is only used in pre-MD. In MD, the background color is derived from
+ // the native theme (so it responds to native theme updates). TODO(estade):
+ // remove when MD is default.
SkColor parent_background_color_;
DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView);

Powered by Google App Engine
This is Rietveld 408576698