diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 20:24:06 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 20:24:06 +0000 |
| commit | f7f5e347291aa012c19eaaf44b8c8cce16e33a1e (patch) | |
| tree | c9de974c620fee47f53f6a2622dd0b01fa1abd54 /chrome/browser/cocoa/download_shelf_view.mm | |
| parent | 15e46d28735180ebb5e57464a50f7a1117729b81 (diff) | |
| download | chromium_src-f7f5e347291aa012c19eaaf44b8c8cce16e33a1e.zip chromium_src-f7f5e347291aa012c19eaaf44b8c8cce16e33a1e.tar.gz chromium_src-f7f5e347291aa012c19eaaf44b8c8cce16e33a1e.tar.bz2 | |
Fix crash when download shelf had no theme.
BUG=http://crbug.com/36951
TEST=quit with download shelf open; don't crash
Review URL: http://codereview.chromium.org/660300
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/download_shelf_view.mm')
| -rw-r--r-- | chrome/browser/cocoa/download_shelf_view.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/download_shelf_view.mm b/chrome/browser/cocoa/download_shelf_view.mm index 4894442..db281cc 100644 --- a/chrome/browser/cocoa/download_shelf_view.mm +++ b/chrome/browser/cocoa/download_shelf_view.mm @@ -14,14 +14,17 @@ - (NSColor*)strokeColor { BOOL isKey = [[self window] isKeyWindow]; ThemeProvider* themeProvider = [[self window] themeProvider]; - return themeProvider->GetNSColor( + return themeProvider ? themeProvider->GetNSColor( isKey ? BrowserThemeProvider::COLOR_TOOLBAR_STROKE : - BrowserThemeProvider::COLOR_TOOLBAR_STROKE_INACTIVE, true); + BrowserThemeProvider::COLOR_TOOLBAR_STROKE_INACTIVE, true) : + [NSColor blackColor]; } - (void)drawRect:(NSRect)rect { BOOL isKey = [[self window] isKeyWindow]; ThemeProvider* themeProvider = [[self window] themeProvider]; + if (!themeProvider) + return; NSImage* backgroundImage = themeProvider->GetNSImageNamed(IDR_THEME_TOOLBAR, false); |