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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm

Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: respond to comments Created 5 years 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/bookmarks/bookmark_bar_toolbar_view.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm
index 77d95d9031792e6e72a69ba6f130c6acceb16099..55844fe2e47c0ffea524c8c5535880b91e528993 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm
@@ -46,8 +46,8 @@
- (void)drawAsDetachedBubble:(NSRect)dirtyRect {
CGFloat morph = [controller_ detachedMorphProgress];
- ThemeService* themeService = [controller_ themeService];
- if (!themeService)
+ Profile* profile = [controller_ profile];
+ if (!profile)
return;
[[NSColor whiteColor] set];
@@ -55,7 +55,7 @@
// Overlay with a lighter background color.
NSColor* toolbarColor = gfx::SkColorToCalibratedNSColor(
- chrome::GetDetachedBookmarkBarBackgroundColor(themeService));
+ chrome::GetDetachedBookmarkBarBackgroundColor(profile));
CGFloat alpha = morph * [toolbarColor alphaComponent];
[[toolbarColor colorWithAlphaComponent:alpha] set];
NSRectFillUsingOperation(dirtyRect, NSCompositeSourceOver);
@@ -76,7 +76,7 @@
strokeRect.size.height = [self cr_lineWidth];
if (NSIntersectsRect(strokeRect, dirtyRect)) {
NSColor* strokeColor = gfx::SkColorToCalibratedNSColor(
- chrome::GetDetachedBookmarkBarSeparatorColor(themeService));
+ chrome::GetDetachedBookmarkBarSeparatorColor(profile));
strokeColor = [[self strokeColor] blendedColorWithFraction:morph
ofColor:strokeColor];
strokeColor = [strokeColor colorWithAlphaComponent:0.5];

Powered by Google App Engine
This is Rietveld 408576698