Merge 24830 - If a preferences file references a theme which is from an old v...

chrome/browser/browser_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/browser_theme_provider.h"
 
 #include "base/file_util.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
@@ skipping 1107 matching lines @@
 
 void BrowserThemeProvider::NotifyThemeChanged() {
   // Redraw!
   NotificationService* service = NotificationService::current();
   service->Notify(NotificationType::BROWSER_THEME_CHANGED,
                   Source<BrowserThemeProvider>(this),
                   NotificationService::NoDetails());
 }
 
 void BrowserThemeProvider::LoadThemePrefs() {
-  // Images were already processed when theme was set.
   process_images_ = false;
-
   PrefService* prefs = profile_->GetPrefs();
 
   // TODO(glen): Figure out if any custom prefs were loaded, and if so
   //    UMA-log the fact that a theme was loaded.
   if (prefs->HasPrefPath(prefs::kCurrentThemeImages) ||
       prefs->HasPrefPath(prefs::kCurrentThemeColors) ||
       prefs->HasPrefPath(prefs::kCurrentThemeTints)) {
     // Our prefs already have the extension path baked in, so we don't need
     // to provide it.
     SetImageData(prefs->GetMutableDictionary(prefs::kCurrentThemeImages),
                  FilePath());
     SetColorData(prefs->GetMutableDictionary(prefs::kCurrentThemeColors));
     SetTintData(prefs->GetMutableDictionary(prefs::kCurrentThemeTints));
     SetDisplayPropertyData(
         prefs->GetMutableDictionary(prefs::kCurrentThemeDisplayProperties));
+
+    // If we're not loading the frame from the cached image dir, we are using
+    // an old preferences file, or the processed images were not saved
+    // correctly.  Force image reprocessing and caching.
+    if (images_.count(IDR_THEME_FRAME) > 0) {
+#if defined(OS_WIN)
+      FilePath cache_path = FilePath(UTF8ToWide(images_[IDR_THEME_FRAME]));
+#else
+      FilePath cache_path = FilePath(images_[IDR_THEME_FRAME]);
+#endif
+      process_images_ = !file_util::ContainsPath(image_dir_, cache_path);
+    }
+
     GenerateFrameColors();
     GenerateFrameImages();
     GenerateTabImages();
+    if (process_images_) {
+      WriteImagesToDisk();
+      UserMetrics::RecordAction(L"Migrated noncached to cached theme.",
+                                profile_);
+    }
     UserMetrics::RecordAction(L"Themes_loaded", profile_);
   }
 }
 
 void BrowserThemeProvider::ClearCaches() {
   FreePlatformCaches();
   for (ImageCache::iterator i = image_cache_.begin();
        i != image_cache_.end(); i++) {
     delete i->second;
   }
   image_cache_.clear();
 
   // The SkBitmaps in the image_save_cache_ are a subset of those stored in
   // the image_cache_, and have therefore all been deleted in the lines above.
   // TODO(mirandac): make memory management clearer here.
   image_save_cache_.clear();
 }
 
 #if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif