GTK: Refactor some things so GTK doesn't touch the on disk image cache.

chrome/browser/gtk/gtk_theme_provider.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #include "app/gfx/color_utils.h"
 #include "base/gfx/gtk_util.h"
@@ skipping 240 matching lines @@
 
   // Notify all GtkChromeButtons of their new rendering mode:
   for (std::vector<GtkWidget*>::iterator it = chrome_buttons_.begin();
        it != chrome_buttons_.end(); ++it) {
     gtk_chrome_button_set_use_gtk_rendering(
         GTK_CHROME_BUTTON(*it), use_gtk_);
   }
 }
 
 SkBitmap* GtkThemeProvider::LoadThemeBitmap(int id) {
-  if (id == IDR_THEME_TOOLBAR && use_gtk_) {
-    GtkStyle* style = gtk_rc_get_style(fake_window_);
-    GdkColor* color = &style->bg[GTK_STATE_NORMAL];
-    SkBitmap* bitmap = new SkBitmap;
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                      kToolbarImageWidth, kToolbarImageHeight);
-    bitmap->allocPixels();
-    bitmap->eraseRGB(color->red >> 8, color->green >> 8, color->blue >> 8);
-    return bitmap;
-  } else {
-    return BrowserThemeProvider::LoadThemeBitmap(id);
+  if (use_gtk_) {
+    if (id == IDR_THEME_TOOLBAR) {
+      GtkStyle* style = gtk_rc_get_style(fake_window_);
+      GdkColor* color = &style->bg[GTK_STATE_NORMAL];
+      SkBitmap* bitmap = new SkBitmap;
+      bitmap->setConfig(SkBitmap::kARGB_8888_Config,
+                        kToolbarImageWidth, kToolbarImageHeight);
+      bitmap->allocPixels();
+      bitmap->eraseRGB(color->red >> 8, color->green >> 8, color->blue >> 8);
+      return bitmap;
+    } else if ((id == IDR_THEME_TAB_BACKGROUND ||
+                id == IDR_THEME_TAB_BACKGROUND_INCOGNITO)) {
+      return GenerateTabBackgroundBitmapImpl(id);
+    }
   }
+
+  return BrowserThemeProvider::LoadThemeBitmap(id);
 }
 
 void GtkThemeProvider::SaveThemeBitmap(const std::string resource_name,
                                        int id) {
   if (!use_gtk_) {
     // Prevent us from writing out our mostly unused resources in gtk theme
     // mode. Simply preventing us from writing this data out in gtk mode isn't
     // the best design, but this would probably be a very invasive change on
     // all three platforms otherwise.
     BrowserThemeProvider::SaveThemeBitmap(resource_name, id);
@@ skipping 144 matching lines @@
   // color for all inactive windows, otherwise we end up neon pink half the
   // time.
   SetThemeColorFromGtk(kColorFrameInactive, &inactive_frame_color);
   SetThemeTintFromGtk(kTintFrameInactive, &inactive_frame_color,
                       kExactColor);
   SetThemeTintFromGtk(kTintFrameIncognitoInactive, &inactive_frame_color,
                       kExactColor);
 
   force_process_images();
   GenerateFrameColors();
+  AutoLock lock(themed_image_cache_lock_);
   GenerateFrameImages();
 }
 
 void GtkThemeProvider::SetThemeColorFromGtk(const char* id, GdkColor* color) {
   SetColor(id, GdkToSkColor(color));
 }
 
 void GtkThemeProvider::SetThemeTintFromGtk(
     const char* id,
     GdkColor* color,
@@ skipping 21 matching lines @@
 }
 
 void GtkThemeProvider::OnDestroyChromeButton(GtkWidget* button,
                                              GtkThemeProvider* provider) {
   std::vector<GtkWidget*>::iterator it =
       find(provider->chrome_buttons_.begin(), provider->chrome_buttons_.end(),
            button);
   if (it != provider->chrome_buttons_.end())
     provider->chrome_buttons_.erase(it);
 }