Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_activity_ui.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Made ChromeURLDataManager's destructor virtual Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h" 5 #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
10 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 11 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
11 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 12 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
12 #include "chrome/browser/ui/webui/shared_resources_data_source.h" 13 #include "chrome/browser/ui/webui/shared_resources_data_source.h"
13 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
14 #include "content/public/browser/web_ui.h" 15 #include "content/public/browser/web_ui.h"
15 #include "grit/browser_resources.h" 16 #include "grit/browser_resources.h"
16 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
17 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
18 19
19 ExtensionActivityUI::ExtensionActivityUI(content::WebUI* web_ui) 20 ExtensionActivityUI::ExtensionActivityUI(content::WebUI* web_ui)
(...skipping 16 matching lines...) Expand all
36 // Resources. 37 // Resources.
37 source->add_resource_path("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS); 38 source->add_resource_path("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS);
38 source->set_default_resource(IDR_EXTENSION_ACTIVITY_HTML); 39 source->set_default_resource(IDR_EXTENSION_ACTIVITY_HTML);
39 40
40 // Callback handlers. 41 // Callback handlers.
41 web_ui->RegisterMessageCallback("requestExtensionData", 42 web_ui->RegisterMessageCallback("requestExtensionData",
42 base::Bind(&ExtensionActivityUI::HandleRequestExtensionData, 43 base::Bind(&ExtensionActivityUI::HandleRequestExtensionData,
43 base::Unretained(this))); 44 base::Unretained(this)));
44 45
45 Profile* profile = Profile::FromWebUI(web_ui); 46 Profile* profile = Profile::FromWebUI(web_ui);
46 profile->GetChromeURLDataManager()->AddDataSource(source); 47 ChromeURLDataManager::AddDataSource(profile, source);
47 profile->GetChromeURLDataManager()->AddDataSource( 48 ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource());
48 new SharedResourcesDataSource());
49 } 49 }
50 50
51 ExtensionActivityUI::~ExtensionActivityUI() { 51 ExtensionActivityUI::~ExtensionActivityUI() {
52 if (extension_) 52 if (extension_)
53 ExtensionActivityLog::GetInstance()->RemoveObserver(extension_, this); 53 ExtensionActivityLog::GetInstance()->RemoveObserver(extension_, this);
54 } 54 }
55 55
56 void ExtensionActivityUI::HandleRequestExtensionData( 56 void ExtensionActivityUI::HandleRequestExtensionData(
57 const base::ListValue* args) { 57 const base::ListValue* args) {
58 DCHECK_EQ(1U, args->GetSize()); 58 DCHECK_EQ(1U, args->GetSize());
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void ExtensionActivityUI::OnExtensionActivity( 92 void ExtensionActivityUI::OnExtensionActivity(
93 const Extension* extension, 93 const Extension* extension,
94 ExtensionActivityLog::Activity activity, 94 ExtensionActivityLog::Activity activity,
95 const std::string& msg) { 95 const std::string& msg) {
96 DictionaryValue result; 96 DictionaryValue result;
97 result.SetInteger("activity", activity); 97 result.SetInteger("activity", activity);
98 result.SetString("message", msg); 98 result.SetString("message", msg);
99 web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity", 99 web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity",
100 result); 100 result);
101 } 101 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/downloads_ui.cc ('k') | chrome/browser/ui/webui/extensions/extensions_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698