Ben's fixes

chrome/browser/ui/webui/extensions/extension_activity_ui.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/ui/webui/extensions/extension_activity_ui.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/ui/webui/shared_resources_data_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ExtensionActivityUI::ExtensionActivityUI(content::WebUI* web_ui)
     : WebUIController(web_ui), extension_(NULL) {
   web_ui->HideURL();
@@ skipping 12 matching lines @@
   source->set_use_json_js_format_v2();
   source->set_json_path("strings.js");
 
   // Resources.
   source->add_resource_path("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS);
   source->set_default_resource(IDR_EXTENSION_ACTIVITY_HTML);
 
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, source);
   ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource());
+#if defined(OS_CHROMEOS)
+  ChromeURLDataManager::AddDataSource(profile, new ThemeSource(profile));
+#endif
 
   // Callback handlers.
   web_ui->RegisterMessageCallback("requestExtensionData",
       base::Bind(&ExtensionActivityUI::HandleRequestExtensionData,
                  base::Unretained(this)));
 }
 
 ExtensionActivityUI::~ExtensionActivityUI() {
   if (extension_)
     extensions::ActivityLog::GetInstance()->RemoveObserver(extension_, this);
@@ skipping 38 matching lines @@
 void ExtensionActivityUI::OnExtensionActivity(
       const extensions::Extension* extension,
       extensions::ActivityLog::Activity activity,
       const std::string& msg) {
   DictionaryValue result;
   result.SetInteger("activity", activity);
   result.SetString("message", msg);
   web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity",
                                    result);
 }