Move 'theme' parsing out of Extension class

chrome/browser/themes/theme_service.cc

 // 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.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/sequenced_task_runner.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/browser/themes/theme_syncable_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/themes/theme_handler.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_WIN)
@@ skipping 175 matching lines @@
 bool ThemeService::IsThemeableImage(int resource_id) {
   return HasThemeableImage(resource_id);
 }
 
 ThemeService::ThemeService()
     : rb_(ResourceBundle::GetSharedInstance()),
       profile_(NULL),
       number_of_infobars_(0) {
   // Initialize the themeable image map so we can use it on other threads.
   HasThemeableImage(0);
+
+  // Register the ManifestHandler for parsing 'theme' manifest key.
+  extensions::ManifestHandler::Register(extension_manifest_keys::kTheme,
+                                        new extensions::ThemeHandler);

[pkotwicz, 2013/01/30 20:45:28]

This is probably a stupid question. Is there any guarantee that the ThemeService
has been created at the time that we are parsing a theme?

[Joe Thomas, 2013/01/30 21:12:45]

Thanks for the review!

On 2013/01/30 20:45:28, pkotwicz wrote:
Yes, we are making sure that ThemeService gets started at Profile Start-up
(please see the change in theme_service_factory.cc/h). We try to parse the
Manifest file of extension/theme only after profile start-up.

 }
 
 ThemeService::~ThemeService() {
   FreePlatformCaches();
 }
 
 void ThemeService::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
 
@@ skipping 468 matching lines @@
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }