Chromium Code Reviews| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm |
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm |
| index 06a611230eb3e8d9c70daa9c63b6e8d8309ef226..3d6a25b77ced4d922023ae085b9a10b22ba99b54 100644 |
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm |
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm |
| @@ -5,11 +5,11 @@ |
| #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" |
| #import "base/logging.h" |
| -#import "base/memory/scoped_nsobject.h" |
| +#import "base/mac/scoped_nsobject.h" |
| #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" |
| #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" |
| -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" |
| #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" |
| +#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" |
| using bookmarks::kBookmarkBarMenuCornerRadius; |
| @@ -60,13 +60,13 @@ using bookmarks::kBookmarkBarMenuCornerRadius; |
| NSColor* endColor = |
| [startColor gtm_colorAdjustedFor:GTMColorationLightPenumbra faded:YES]; |
| - scoped_nsobject<NSGradient> gradient( |
| - [[NSGradient alloc] initWithColorsAndLocations:startColor, 0.0, |
| - midColor, 0.25, |
| - endColor, 0.5, |
| - midColor, 0.75, |
| - startColor, 1.0, |
| - nil]); |
| + base::scoped_nsobject<NSGradient> gradient( |
| + [[NSGradient alloc] initWithColorsAndLocations:startColor, 0.0, |
| + midColor, 0.25, |
| + endColor, 0.5, |
| + midColor, 0.75, |
| + startColor, 1.0, |
| + nil]); |
|
Nico
2013/06/25 01:09:50
Filed PR16435 and PR16436 for this.
|
| [gradient drawInBezierPath:bezier angle:0.0]; |
| } |