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

Side by Side Diff: chrome/browser/ui/webui/nacl_ui.cc

Issue 11746012: [webui] whittle down a few more uses of old-style templateData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move include 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
« no previous file with comments | « chrome/browser/ui/webui/flash_ui.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('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/nacl_ui.h" 5 #include "chrome/browser/ui/webui/nacl_ui.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 using content::PluginService; 43 using content::PluginService;
44 using content::UserMetricsAction; 44 using content::UserMetricsAction;
45 using content::WebUIMessageHandler; 45 using content::WebUIMessageHandler;
46 46
47 namespace { 47 namespace {
48 48
49 ChromeWebUIDataSource* CreateNaClUIHTMLSource() { 49 ChromeWebUIDataSource* CreateNaClUIHTMLSource() {
50 ChromeWebUIDataSource* source = 50 ChromeWebUIDataSource* source =
51 new ChromeWebUIDataSource(chrome::kChromeUINaClHost); 51 new ChromeWebUIDataSource(chrome::kChromeUINaClHost);
52 52
53 source->set_use_json_js_format_v2();
53 source->AddLocalizedString("loadingMessage", IDS_NACL_LOADING_MESSAGE); 54 source->AddLocalizedString("loadingMessage", IDS_NACL_LOADING_MESSAGE);
54 source->AddLocalizedString("naclLongTitle", IDS_NACL_TITLE_MESSAGE); 55 source->AddLocalizedString("naclLongTitle", IDS_NACL_TITLE_MESSAGE);
55 source->set_json_path("strings.js"); 56 source->set_json_path("strings.js");
56 source->add_resource_path("about_nacl.css", IDR_ABOUT_NACL_CSS); 57 source->add_resource_path("about_nacl.css", IDR_ABOUT_NACL_CSS);
57 source->add_resource_path("about_nacl.js", IDR_ABOUT_NACL_JS); 58 source->add_resource_path("about_nacl.js", IDR_ABOUT_NACL_JS);
58 source->set_default_resource(IDR_ABOUT_NACL_HTML); 59 source->set_default_resource(IDR_ABOUT_NACL_HTML);
59 return source; 60 return source;
60 } 61 }
61 62
62 //////////////////////////////////////////////////////////////////////////////// 63 ////////////////////////////////////////////////////////////////////////////////
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 272
272 NaClUI::NaClUI(content::WebUI* web_ui) : WebUIController(web_ui) { 273 NaClUI::NaClUI(content::WebUI* web_ui) : WebUIController(web_ui) {
273 content::RecordAction(UserMetricsAction("ViewAboutNaCl")); 274 content::RecordAction(UserMetricsAction("ViewAboutNaCl"));
274 275
275 web_ui->AddMessageHandler(new NaClDOMHandler()); 276 web_ui->AddMessageHandler(new NaClDOMHandler());
276 277
277 // Set up the about:nacl source. 278 // Set up the about:nacl source.
278 Profile* profile = Profile::FromWebUI(web_ui); 279 Profile* profile = Profile::FromWebUI(web_ui);
279 ChromeURLDataManager::AddDataSource(profile, CreateNaClUIHTMLSource()); 280 ChromeURLDataManager::AddDataSource(profile, CreateNaClUIHTMLSource());
280 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/flash_ui.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698