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

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

Issue 1438513003: [MD] Implement incognito colors as a NativeTheme (for Aura). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iterate on chips 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/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index b31d937849f814ee01d2547919a618f68ab5f52e..f0ad63e872326b47d49619f3b69ae335fa0e9671 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -118,7 +118,7 @@ class LocationBarView : public LocationBar,
TEXT,
SELECTED_TEXT,
DEEMPHASIZED_TEXT,
- SECURITY_TEXT,
+ EV_BUBBLE_TEXT_AND_BORDER,
};
LocationBarView(Browser* browser,
@@ -138,8 +138,12 @@ class LocationBarView : public LocationBar,
// Returns the appropriate color for the desired kind, based on the user's
// system theme.
- SkColor GetColor(SecurityStateModel::SecurityLevel security_level,
- ColorKind kind) const;
+ SkColor GetColor(ColorKind kind) const;
+
+ // Returns the color to be used for security text in the context of
+ // |security_level|.
+ SkColor GetSecureTextColor(
+ SecurityStateModel::SecurityLevel security_level) const;
// Returns the delegate.
Delegate* delegate() const { return delegate_; }
@@ -247,6 +251,7 @@ class LocationBarView : public LocationBar,
void GetAccessibleState(ui::AXViewState* state) override;
gfx::Size GetPreferredSize() const override;
void Layout() override;
+ void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
// ChromeOmniboxEditController:
void UpdateWithoutTabRestore() override;

Powered by Google App Engine
This is Rietveld 408576698