diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 19:31:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 19:31:55 +0000 |
| commit | 26fafd6ab357e619660d43e178868d6a11d45cc3 (patch) | |
| tree | 3d5b46b3e552bdb9b643d1e962da029627df2b85 /chrome/browser/browser_theme_provider.cc | |
| parent | f039dcd91912b8bf68ec73d744ad38ff4b4d1398 (diff) | |
| download | chromium_src-26fafd6ab357e619660d43e178868d6a11d45cc3.zip chromium_src-26fafd6ab357e619660d43e178868d6a11d45cc3.tar.gz chromium_src-26fafd6ab357e619660d43e178868d6a11d45cc3.tar.bz2 | |
Add call to BrowserThemeProvider::GenerateBitmap removed in r24170.
(Linux relies on the lazy generation provided by GenerateBitmap; having
to call GenerateTabImages() regressed linux startup; theoretically it'd be
nice if everything was done lazily...)
Review URL: http://codereview.chromium.org/180004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_provider.cc')
| -rw-r--r-- | chrome/browser/browser_theme_provider.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc index 3a7dc92..b3b334d 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/browser_theme_provider.cc @@ -275,6 +275,11 @@ SkBitmap* BrowserThemeProvider::GetBitmapNamed(int id) { // Try to load the image from the extension. result.reset(LoadThemeBitmap(id)); + // If the extension doesn't provide the requested image, but has provided + // a custom frame, then we may be able to generate the image required. + if (!result.get()) + result.reset(GenerateBitmap(id)); + // If we still don't have an image, load it from resourcebundle. if (!result.get()) result.reset(new SkBitmap(*rb_.GetBitmapNamed(id))); |