diff options
| -rw-r--r-- | chrome/browser/browser_theme_provider.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/gtk/gtk_theme_provider.cc | 1 |
2 files changed, 5 insertions, 1 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))); diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc index fecff2e..8c76c6d 100644 --- a/chrome/browser/gtk/gtk_theme_provider.cc +++ b/chrome/browser/gtk/gtk_theme_provider.cc @@ -346,7 +346,6 @@ void GtkThemeProvider::LoadGtkValues() { force_process_images(); GenerateFrameColors(); GenerateFrameImages(); - GenerateTabImages(); } void GtkThemeProvider::SetThemeColorFromGtk(const char* id, GdkColor* color) { |