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

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

Issue 11881055: Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix issue in about_ui exposed by cros tests Created 7 years, 11 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 | Annotate | Revision Log
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_url_data_manager.h"
(...skipping 25 matching lines...) Expand all
36 source->AddLocalizedString("extensionActivityContentScript", 36 source->AddLocalizedString("extensionActivityContentScript",
37 IDS_EXTENSION_ACTIVITY_CONTENT_SCRIPT); 37 IDS_EXTENSION_ACTIVITY_CONTENT_SCRIPT);
38 source->set_use_json_js_format_v2(); 38 source->set_use_json_js_format_v2();
39 source->set_json_path("strings.js"); 39 source->set_json_path("strings.js");
40 40
41 // Resources. 41 // Resources.
42 source->add_resource_path("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS); 42 source->add_resource_path("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS);
43 source->set_default_resource(IDR_EXTENSION_ACTIVITY_HTML); 43 source->set_default_resource(IDR_EXTENSION_ACTIVITY_HTML);
44 44
45 Profile* profile = Profile::FromWebUI(web_ui); 45 Profile* profile = Profile::FromWebUI(web_ui);
46 ChromeURLDataManager::AddDataSource(profile, source); 46 ChromeURLDataManager::AddDataSourceImpl(profile, source);
47 ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource()); 47 ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource());
48 48
49 // Callback handlers. 49 // Callback handlers.
50 web_ui->RegisterMessageCallback("requestExtensionData", 50 web_ui->RegisterMessageCallback("requestExtensionData",
51 base::Bind(&ExtensionActivityUI::HandleRequestExtensionData, 51 base::Bind(&ExtensionActivityUI::HandleRequestExtensionData,
52 base::Unretained(this))); 52 base::Unretained(this)));
53 } 53 }
54 54
55 ExtensionActivityUI::~ExtensionActivityUI() { 55 ExtensionActivityUI::~ExtensionActivityUI() {
56 if (extension_) 56 if (extension_)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 scoped_ptr<ListValue> messages_list(new ListValue()); 100 scoped_ptr<ListValue> messages_list(new ListValue());
101 messages_list->AppendStrings(messages); 101 messages_list->AppendStrings(messages);
102 102
103 DictionaryValue result; 103 DictionaryValue result;
104 result.SetInteger("activity", activity); 104 result.SetInteger("activity", activity);
105 result.Set("messages", messages_list.release()); 105 result.Set("messages", messages_list.release());
106 106
107 web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity", 107 web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity",
108 result); 108 result);
109 } 109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698