diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 01:33:07 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 01:33:07 +0000 |
| commit | bf5b77eace70311d937c5e3a29293255c28fcca2 (patch) | |
| tree | c6ced766edc0ea87167d951b77f33f71d1215dbf /chrome/browser/cocoa/bookmark_bar_folder_view.mm | |
| parent | 841bdbc51cea05708fe4d6e29ace9bb11b4c0309 (diff) | |
| download | chromium_src-bf5b77eace70311d937c5e3a29293255c28fcca2.zip chromium_src-bf5b77eace70311d937c5e3a29293255c28fcca2.tar.gz chromium_src-bf5b77eace70311d937c5e3a29293255c28fcca2.tar.bz2 | |
Remove the themeing from the folder menu background, text in the folder menu items, and no longer needed calls.
BUG=39428
TEST=Pop up a folder menu and insure that the background does not adopt any theme settings.
Review URL: http://codereview.chromium.org/1548003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_folder_view.mm')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_view.mm | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_view.mm b/chrome/browser/cocoa/bookmark_bar_folder_view.mm index 9ede01b..cbbd5a2 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_view.mm @@ -4,7 +4,6 @@ #import "chrome/browser/cocoa/bookmark_bar_folder_view.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/bookmark_bar_controller.h" @implementation BookmarkBarFolderView @@ -14,12 +13,6 @@ } - (void)awakeFromNib { - [super awakeFromNib]; - - // BackgroundGradientView's awakeFromNib does a |showsDivider_ = YES|. - // Make sure we turn it off. - [self setShowsDivider:NO]; - NSArray* types = [NSArray arrayWithObject:kBookmarkButtonDragType]; [self registerForDraggedTypes:types]; } @@ -30,8 +23,6 @@ } - (void)drawRect:(NSRect)rect { - [self drawBackground]; - // TODO(jrg): copied from bookmark_bar_view but orientation changed. // Code dup sucks but I'm not sure I can take 16 lines and make it // generic for horiz vs vertical while keeping things simple. @@ -49,14 +40,9 @@ NSMakeRect(kBarHorizPad, dropIndicatorPosition_, NSWidth([self bounds]) - 2*kBarHorizPad, kBarHeight); - // themeProvider is nil in unit tests. - ThemeProvider* themeProvider = [[self controller] themeProvider]; - if (themeProvider) { - NSColor* uglyBlackBarColor = themeProvider-> - GetNSColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT, true); - [[uglyBlackBarColor colorWithAlphaComponent:kBarOpacity] setFill]; - [[NSBezierPath bezierPathWithRect:uglyBlackBar] fill]; - } + NSColor* uglyBlackBarColor = [NSColor blackColor]; + [[uglyBlackBarColor colorWithAlphaComponent:kBarOpacity] setFill]; + [[NSBezierPath bezierPathWithRect:uglyBlackBar] fill]; } } |