Add custom default theme support and create a managed user default theme.

chrome/browser/themes/browser_theme_pack.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_BROWSER_THEME_PACK_H_
 #define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/common/extensions/extension.h"
-#include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"

[pkotwicz, 2013/07/19 18:33:20]

Nit: You should not need to include image.h now that you are forward declaring
it.

[Adrian Kuegel, 2013/07/22 12:58:08]

Right. I forgot to remove the include here. Done.

 
 namespace base {
 class DictionaryValue;
 class FilePath;
 class RefCountedMemory;
 }
 
 namespace extensions {
 class Extensions;
 }
 
+namespace gfx {
+class Image;
+}
+
 namespace ui {
 class DataPack;
 }
 
 // An optimized representation of a theme, backed by a mmapped DataPack.
 //
 // The idea is to pre-process all images (tinting, compositing, etc) at theme
 // install time, save all the PNG-ified data into an mmappable file so we don't
 // suffer multiple file system access times, therefore solving two of the
 // problems with the previous implementation.
 //
 // A note on const-ness. All public, non-static methods are const.  We do this
 // because once we've constructed a BrowserThemePack through the
 // BuildFromExtension() interface, we WriteToDisk() on a thread other than the
 // UI thread that consumes a BrowserThemePack. There is no locking; thread
 // safety between the writing thread and the UI thread is ensured by having the
 // data be immutable.
 //
 // BrowserThemePacks are always deleted on the file thread because in the
 // common case, they are backed by mmapped data and the unmmapping operation
 // will trip our IO on the UI thread detector.
-class BrowserThemePack : public base::RefCountedThreadSafe<
-    BrowserThemePack, content::BrowserThread::DeleteOnFileThread> {
+class BrowserThemePack : public CustomThemeSupplier {
  public:
   // Builds the theme pack from all data from |extension|. This is often done
   // on a separate thread as it takes so long. This can fail and return NULL in
   // the case where the theme has invalid data.
   static scoped_refptr<BrowserThemePack> BuildFromExtension(
       const extensions::Extension* extension);
 
   // Builds the theme pack from a previously performed WriteToDisk(). This
   // operation should be relatively fast, as it should be an mmap() and some
   // pointer swizzling. Returns NULL on any error attempting to read |path|.
   static scoped_refptr<BrowserThemePack> BuildFromDataPack(
       const base::FilePath& path, const std::string& expected_id);
 
+  // Returns the set of image idrs which can be overwritten by a user provided
+  // theme.
+  static void GetThemeableImageIDRs(std::set<int>* result);
+
   // Builds a data pack on disk at |path| for future quick loading by
   // BuildFromDataPack(). Often (but not always) called from the file thread;
   // implementation should be threadsafe because neither thread will write to
   // |image_memory_| and the worker thread will keep a reference to prevent
   // destruction.
   bool WriteToDisk(const base::FilePath& path) const;
 
-  // If this theme specifies data for the corresponding |id|, return true and
-  // write the corresponding value to the output parameter. These functions
-  // don't return the default data. These methods should only be called from
-  // the UI thread. (But this isn't enforced because of unit tests).
-  bool GetTint(int id, color_utils::HSL* hsl) const;
-  bool GetColor(int id, SkColor* color) const;
-  bool GetDisplayProperty(int id, int* result) const;
-
-  // Returns the theme pack image for |id|. Returns an empty image if an image
-  // is not found.
-  gfx::Image GetImageNamed(int id);
-
-  // Returns the raw PNG encoded data for IDR_THEME_NTP_*. This method is only
-  // supposed to work for the NTP attribution and background resources.
-  base::RefCountedMemory* GetRawData(int id,
-                                     ui::ScaleFactor scale_factor) const;
-
-  // Returns the set of image idrs which can be overwritten by a user provided
-  // theme.
-  static void GetThemeableImageIDRs(std::set<int>* result);
-
-  // Whether this theme provides an image for |id|.
-  bool HasCustomImage(int id) const;
+  // Overridden from CustomThemeSupplier:
+  virtual bool GetTint(int id, color_utils::HSL* hsl) const OVERRIDE;
+  virtual bool GetColor(int id, SkColor* color) const OVERRIDE;
+  virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
+  virtual gfx::Image GetImageNamed(int id) OVERRIDE;
+  virtual base::RefCountedMemory* GetRawData(
+      int id, ui::ScaleFactor scale_factor) const OVERRIDE;
+  virtual bool HasCustomImage(int id) const OVERRIDE;
 
  private:
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::FILE>;
-  friend class base::DeleteHelper<BrowserThemePack>;
   friend class BrowserThemePackTest;
 
   // Cached images.
   typedef std::map<int, gfx::Image> ImageCache;
 
   // The raw PNG memory associated with a certain id.
   typedef std::map<int, scoped_refptr<base::RefCountedMemory> > RawImages;
 
   // The type passed to ui::DataPack::WritePack.
   typedef std::map<uint16, base::StringPiece> RawDataForWriting;
@@ skipping 167 matching lines @@
   // Cache of images created in BuildFromExtension(). Once the theme pack is
   // created, this cache should only be accessed on the file thread. There
   // should be no IDs in |image_memory_| that are in |images_on_file_thread_|
   // or vice versa.
   ImageCache images_on_file_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemePack);
 };
 
 #endif  // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_