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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm

Issue 1990703002: [Material][Mac] Update Omnibox bubble decorations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 7 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/cocoa/location_bar/location_bar_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
index e5f4677ed01d91f057238f42a61cf7b98bf3972d..03ed5f87dfc505e82182124cb68c75d079dc7949 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm
@@ -12,7 +12,17 @@
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/paint_vector_icon.h"
+namespace {
+
+// Color values for the Material bubble decoration divider.
+const CGFloat kMaterialDividerAlpha = 38.0;
+const CGFloat kMaterialDividerGrayScale = 0.0;
+const CGFloat kMaterialDividerIncognitoGrayScale = 1.0;
+
+} // namespace
+
const CGFloat LocationBarDecoration::kOmittedWidth = 0.0;
+const SkColor LocationBarDecoration::kMaterialDarkModeTextColor = 0xCCFFFFFF;
bool LocationBarDecoration::IsVisible() const {
return visible_;
@@ -126,10 +136,18 @@ NSSize LocationBarDecoration::GetLabelSize(NSString* label,
SkColor LocationBarDecoration::GetMaterialIconColor(
bool location_bar_is_dark) const {
- return location_bar_is_dark ? SkColorSetA(SK_ColorWHITE, 0xCC)
+ return location_bar_is_dark ? kMaterialDarkModeTextColor
: gfx::kChromeIconGrey;
}
+NSColor* LocationBarDecoration::GetDividerColor(
+ bool location_bar_is_dark) const {
+ CGFloat gray_scale = location_bar_is_dark ? kMaterialDividerIncognitoGrayScale
+ : kMaterialDividerGrayScale;
+ return [NSColor colorWithCalibratedWhite:gray_scale
+ alpha:kMaterialDividerAlpha / 255.0];
+}
+
gfx::VectorIconId LocationBarDecoration::GetMaterialVectorIconId() const {
NOTREACHED();
return gfx::VectorIconId::VECTOR_ICON_NONE;

Powered by Google App Engine
This is Rietveld 408576698