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

Side by Side Diff: chrome/browser/ui/webui/help/help_ui.cc

Issue 10383228: Revert 137554 - convert help page to loadTimeData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/webui/help/help_browsertest.js ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/help/help_ui.h" 5 #include "chrome/browser/ui/webui/help/help_ui.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/webui/help/help_handler.h" 8 #include "chrome/browser/ui/webui/help/help_handler.h"
9 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 9 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
10 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 10 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
11 #include "chrome/browser/ui/webui/shared_resources_data_source.h" 11 #include "chrome/browser/ui/webui/shared_resources_data_source.h"
12 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/browser/web_ui.h" 14 #include "content/public/browser/web_ui.h"
15 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
16 16
17 namespace { 17 namespace {
18 18
19 ChromeWebUIDataSource* CreateAboutPageHTMLSource() { 19 ChromeWebUIDataSource* CreateAboutPageHTMLSource() {
20 ChromeWebUIDataSource* source = 20 ChromeWebUIDataSource* source =
21 new ChromeWebUIDataSource(chrome::kChromeUIHelpFrameHost); 21 new ChromeWebUIDataSource(chrome::kChromeUIHelpFrameHost);
22 22
23 source->set_json_path("strings.js"); 23 source->set_json_path("strings.js");
24 source->set_use_json_js_format_v2();
25 source->add_resource_path("help.js", IDR_HELP_JS); 24 source->add_resource_path("help.js", IDR_HELP_JS);
26 source->set_default_resource(IDR_HELP_HTML); 25 source->set_default_resource(IDR_HELP_HTML);
27 return source; 26 return source;
28 } 27 }
29 28
30 } // namespace 29 } // namespace
31 30
32 HelpUI::HelpUI(content::WebUI* web_ui) 31 HelpUI::HelpUI(content::WebUI* web_ui)
33 : WebUIController(web_ui) { 32 : WebUIController(web_ui) {
34 Profile* profile = Profile::FromWebUI(web_ui); 33 Profile* profile = Profile::FromWebUI(web_ui);
35 ChromeWebUIDataSource* source = CreateAboutPageHTMLSource(); 34 ChromeWebUIDataSource* source = CreateAboutPageHTMLSource();
36 ChromeURLDataManager::AddDataSource(profile, source); 35 ChromeURLDataManager::AddDataSource(profile, source);
37 ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource()); 36 ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource());
38 37
39 HelpHandler* handler = new HelpHandler(); 38 HelpHandler* handler = new HelpHandler();
40 handler->GetLocalizedValues(source->localized_strings()); 39 handler->GetLocalizedValues(source->localized_strings());
41 web_ui->AddMessageHandler(handler); 40 web_ui->AddMessageHandler(handler);
42 } 41 }
43 42
44 HelpUI::~HelpUI() { 43 HelpUI::~HelpUI() {
45 } 44 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/help/help_browsertest.js ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698