Reland: Chrome side work for allowing a user to revert to their previous theme without closing ...

chrome/browser/themes/theme_service.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 117 matching lines @@
   virtual std::string GetThemeID() const;
 
   // This class needs to keep track of the number of theme infobars so that we
   // clean up unused themes.
   void OnInfobarDisplayed();
 
   // Decrements the number of theme infobars. If the last infobar has been
   // destroyed, uninstalls all themes that aren't the currently selected.
   void OnInfobarDestroyed();
 
-  // Remove preference values for themes that are no longer in use.
-  void RemoveUnusedThemes();
+  // Uninstall theme extensions which are no longer in use. |ignore_infobars| is
+  // whether unused themes should be removed despite a theme infobar being
+  // visible.
+  void RemoveUnusedThemes(bool ignore_infobars);
 
   // Returns the syncable service for syncing theme. The returned service is
   // owned by |this| object.
   virtual ThemeSyncableService* GetThemeSyncableService() const;
 
   // Save the images to be written to disk, mapping file path to id.
   typedef std::map<base::FilePath, int> ImagesDiskCache;
 
  protected:
   // Set a custom default theme instead of the normal default theme.
@@ skipping 33 matching lines @@
   }
 
   // True if the theme service is ready to be used.
   // TODO(pkotwicz): Add DCHECKS to the theme service's getters once
   // ThemeSource no longer uses the ThemeService when it is not ready.
   bool ready_;
 
  private:
   friend class theme_service_internal::ThemeServiceTest;
 
+  // Called when the extension service is ready.
+  void OnExtensionServiceReady();
+
+  // Migrate the theme to the new theme pack schema by recreating the data pack
+  // from the extension.
+  void MigrateTheme();
+
   // Replaces the current theme supplier with a new one and calls
   // StopUsingTheme() or StartUsingTheme() as appropriate.
   void SwapThemeSupplier(scoped_refptr<CustomThemeSupplier> theme_supplier);
 
-  // Migrate the theme to the new theme pack schema by recreating the data pack
-  // from the extension.
-  void MigrateTheme();
-
   // Saves the filename of the cached theme pack.
   void SavePackName(const base::FilePath& pack_path);
 
   // Save the id of the last theme installed.
   void SaveThemeID(const std::string& id);
 
   // Implementation of SetTheme() (and the fallback from LoadThemePrefs() in
   // case we don't have a theme pack).
   void BuildFromExtension(const extensions::Extension* extension);
 
@@ skipping 26 matching lines @@
 
   typedef std::map<int, NSGradient*> NSGradientMap;
   mutable NSGradientMap nsgradient_cache_;
 #endif
 
   ui::ResourceBundle& rb_;
   Profile* profile_;
 
   scoped_refptr<CustomThemeSupplier> theme_supplier_;
 
+  // The id of the theme extension which has just been installed but has not
+  // been loaded yet. The theme extension with |installed_pending_load_id_| may
+  // never be loaded if the install is due to updating a disabled theme.
+  // |pending_install_id_| should be set to |kDefaultThemeID| if there are no
+  // recently installed theme extensions
+  std::string installed_pending_load_id_;
+
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
   content::NotificationRegistrar registrar_;
 
   scoped_ptr<ThemeSyncableService> theme_syncable_service_;
 
   base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_