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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 12045022: Move code in ui\webui\jstemplate_builder.* to webui namespace for consistency. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 resource_id = IDR_NET_ERROR_HTML; 766 resource_id = IDR_NET_ERROR_HTML;
767 } 767 }
768 768
769 const base::StringPiece template_html( 769 const base::StringPiece template_html(
770 ResourceBundle::GetSharedInstance().GetRawDataResource( 770 ResourceBundle::GetSharedInstance().GetRawDataResource(
771 resource_id)); 771 resource_id));
772 if (template_html.empty()) { 772 if (template_html.empty()) {
773 NOTREACHED() << "unable to load template. ID: " << resource_id; 773 NOTREACHED() << "unable to load template. ID: " << resource_id;
774 } else { 774 } else {
775 // "t" is the id of the templates root node. 775 // "t" is the id of the templates root node.
776 *error_html = jstemplate_builder::GetTemplatesHtml( 776 *error_html = webui::GetTemplatesHtml(template_html, &error_strings, "t");
777 template_html, &error_strings, "t");
778 } 777 }
779 } 778 }
780 779
781 if (error_description) { 780 if (error_description) {
782 if (!extension && !is_repost) 781 if (!extension && !is_repost)
783 *error_description = LocalizedError::GetErrorDetails(error); 782 *error_description = LocalizedError::GetErrorDetails(error);
784 } 783 }
785 } 784 }
786 785
787 bool ChromeContentRendererClient::RunIdleHandlerWhenWidgetsHidden() { 786 bool ChromeContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 } 1038 }
1040 1039
1041 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1040 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1042 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1041 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1043 #if defined(ENABLE_PLUGINS) 1042 #if defined(ENABLE_PLUGINS)
1044 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1043 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1045 #endif 1044 #endif
1046 } 1045 }
1047 1046
1048 } // namespace chrome 1047 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/net/net_resource_provider.cc ('k') | chrome/renderer/plugins/plugin_placeholder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698