This is the first pass at themes.

This CL is paired with http://codereview.chromium.org/67284

This CL (for commit purposes) includes http://codereview.chromium.org/67284

BUG=4463,11232,11233,11234,11235

Review URL: http://codereview.chromium.org/99030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15704 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 6 deletions

diff --git a/app/resource_bundle.h b/app/resource_bundle.h
index e939edc..1ed44b0 100644
--- a/app/resource_bundle.h
+++ b/app/resource_bundle.h
@@ -18,7 +18,7 @@
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/extensions/extension.h"
+#include "base/string16.h"
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 namespace base {
@@ -29,8 +29,8 @@ class DataPack;
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 class ChromeFont;
-class Extension;
 class SkBitmap;
+typedef uint32 SkColor;
 class StringPiece;
 
 // ResourceBundle is a central facility to load images and other resources,
@@ -123,8 +123,14 @@ class ResourceBundle {
   GdkPixbuf* GetPixbufNamed(int resource_id);
 #endif
 
-  // Sets an Extension object that can handle theme resource requests.
-  void SetThemeExtension(const Extension& e);
+  // TODO(glen): Move these into theme provider (dialogs still depend on
+  //    ResourceBundle).
+  static const SkColor frame_color;
+  static const SkColor frame_color_inactive;
+  static const SkColor frame_color_incognito;
+  static const SkColor frame_color_incognito_inactive;
+  static const SkColor toolbar_color;
+  static const SkColor toolbar_separator_color;
 
  private:
   // We define a DataHandle typedef to abstract across how data is stored
@@ -195,8 +201,6 @@ class ResourceBundle {
 
   static ResourceBundle* g_shared_instance_;
 
-  scoped_ptr<Extension> theme_extension_;
-
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };