Chromium Code Reviews| 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 a609c13deffddabdecd0acd156d61b95bb8e6607..91a7897340e259c2e98405c982b7a2e51f703dda 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]; |
|
groby-ooo-7-16
2015/12/11 02:32:00
Continuing the discussion of removal of themeServi
Evan Stade
2015/12/11 19:36:58
doesn't seem like that should work based on the ty
|
| + if (!profile) |
| return; |
| [[NSColor whiteColor] set]; |
| @@ -55,7 +55,7 @@ |
| // Overlay with a lighter background color. |
| NSColor* toolbarColor = skia::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 = skia::SkColorToCalibratedNSColor( |
| - chrome::GetDetachedBookmarkBarSeparatorColor(themeService)); |
| + chrome::GetDetachedBookmarkBarSeparatorColor(profile)); |
| strokeColor = [[self strokeColor] blendedColorWithFraction:morph |
| ofColor:strokeColor]; |
| strokeColor = [strokeColor colorWithAlphaComponent:0.5]; |