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

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

Issue 10830218: Move localized_error from chrome/renderer into chrome/common. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: add comment Created 8 years, 4 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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/string_tokenizer.h" 13 #include "base/string_tokenizer.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/common/child_process_logging.h" 16 #include "chrome/common/child_process_logging.h"
17 #include "chrome/common/chrome_content_client.h" 17 #include "chrome/common/chrome_content_client.h"
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/content_settings_pattern.h" 20 #include "chrome/common/content_settings_pattern.h"
21 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
22 #include "chrome/common/extensions/extension_constants.h" 22 #include "chrome/common/extensions/extension_constants.h"
23 #include "chrome/common/extensions/extension_process_policy.h" 23 #include "chrome/common/extensions/extension_process_policy.h"
24 #include "chrome/common/extensions/extension_set.h" 24 #include "chrome/common/extensions/extension_set.h"
25 #include "chrome/common/external_ipc_fuzzer.h" 25 #include "chrome/common/external_ipc_fuzzer.h"
26 #include "chrome/common/jstemplate_builder.h" 26 #include "chrome/common/jstemplate_builder.h"
27 #include "chrome/common/localized_error.h"
27 #include "chrome/common/render_messages.h" 28 #include "chrome/common/render_messages.h"
28 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
29 #include "chrome/renderer/autofill/autofill_agent.h" 30 #include "chrome/renderer/autofill/autofill_agent.h"
30 #include "chrome/renderer/autofill/password_autofill_manager.h" 31 #include "chrome/renderer/autofill/password_autofill_manager.h"
31 #include "chrome/renderer/autofill/password_generation_manager.h" 32 #include "chrome/renderer/autofill/password_generation_manager.h"
32 #include "chrome/renderer/automation/automation_renderer_helper.h" 33 #include "chrome/renderer/automation/automation_renderer_helper.h"
33 #include "chrome/renderer/benchmarking_extension.h" 34 #include "chrome/renderer/benchmarking_extension.h"
34 #include "chrome/renderer/chrome_render_process_observer.h" 35 #include "chrome/renderer/chrome_render_process_observer.h"
35 #include "chrome/renderer/chrome_render_view_observer.h" 36 #include "chrome/renderer/chrome_render_view_observer.h"
36 #include "chrome/renderer/content_settings_observer.h" 37 #include "chrome/renderer/content_settings_observer.h"
37 #include "chrome/renderer/extensions/chrome_v8_context.h" 38 #include "chrome/renderer/extensions/chrome_v8_context.h"
38 #include "chrome/renderer/extensions/chrome_v8_extension.h" 39 #include "chrome/renderer/extensions/chrome_v8_extension.h"
39 #include "chrome/renderer/extensions/extension_dispatcher.h" 40 #include "chrome/renderer/extensions/extension_dispatcher.h"
40 #include "chrome/renderer/extensions/extension_helper.h" 41 #include "chrome/renderer/extensions/extension_helper.h"
41 #include "chrome/renderer/extensions/extension_resource_request_policy.h" 42 #include "chrome/renderer/extensions/extension_resource_request_policy.h"
42 #include "chrome/renderer/extensions/miscellaneous_bindings.h" 43 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
43 #include "chrome/renderer/external_extension.h" 44 #include "chrome/renderer/external_extension.h"
44 #include "chrome/renderer/loadtimes_extension_bindings.h" 45 #include "chrome/renderer/loadtimes_extension_bindings.h"
45 #include "chrome/renderer/localized_error.h"
46 #include "chrome/renderer/net/renderer_net_predictor.h" 46 #include "chrome/renderer/net/renderer_net_predictor.h"
47 #include "chrome/renderer/page_click_tracker.h" 47 #include "chrome/renderer/page_click_tracker.h"
48 #include "chrome/renderer/page_load_histograms.h" 48 #include "chrome/renderer/page_load_histograms.h"
49 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" 49 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h"
50 #include "chrome/renderer/pepper/pepper_helper.h" 50 #include "chrome/renderer/pepper/pepper_helper.h"
51 #include "chrome/renderer/playback_extension.h" 51 #include "chrome/renderer/playback_extension.h"
52 #include "chrome/renderer/plugins/plugin_placeholder.h" 52 #include "chrome/renderer/plugins/plugin_placeholder.h"
53 #include "chrome/renderer/plugins/plugin_uma.h" 53 #include "chrome/renderer/plugins/plugin_uma.h"
54 #include "chrome/renderer/prerender/prerender_dispatcher.h" 54 #include "chrome/renderer/prerender/prerender_dispatcher.h"
55 #include "chrome/renderer/prerender/prerender_helper.h" 55 #include "chrome/renderer/prerender/prerender_helper.h"
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 LocalizedError::GetAppErrorStrings(error, failed_url, extension, 678 LocalizedError::GetAppErrorStrings(error, failed_url, extension,
679 &error_strings); 679 &error_strings);
680 680
681 // TODO(erikkay): Should we use a different template for different 681 // TODO(erikkay): Should we use a different template for different
682 // error messages? 682 // error messages?
683 resource_id = IDR_ERROR_APP_HTML; 683 resource_id = IDR_ERROR_APP_HTML;
684 } else { 684 } else {
685 if (is_repost) { 685 if (is_repost) {
686 LocalizedError::GetFormRepostStrings(failed_url, &error_strings); 686 LocalizedError::GetFormRepostStrings(failed_url, &error_strings);
687 } else { 687 } else {
688 LocalizedError::GetStrings(error, &error_strings); 688 LocalizedError::GetStrings(error, &error_strings,
689 RenderThread::Get()->GetLocale());
689 } 690 }
690 resource_id = IDR_NET_ERROR_HTML; 691 resource_id = IDR_NET_ERROR_HTML;
691 } 692 }
692 693
693 const base::StringPiece template_html( 694 const base::StringPiece template_html(
694 ResourceBundle::GetSharedInstance().GetRawDataResource( 695 ResourceBundle::GetSharedInstance().GetRawDataResource(
695 resource_id, ui::SCALE_FACTOR_NONE)); 696 resource_id, ui::SCALE_FACTOR_NONE));
696 if (template_html.empty()) { 697 if (template_html.empty()) {
697 NOTREACHED() << "unable to load template. ID: " << resource_id; 698 NOTREACHED() << "unable to load template. ID: " << resource_id;
698 } else { 699 } else {
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 948 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
948 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 949 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
949 } 950 }
950 951
951 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 952 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
952 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 953 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
953 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 954 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
954 } 955 }
955 956
956 } // namespace chrome 957 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698