| OLD | NEW |
| 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" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
| 14 #include "base/string_tokenizer.h" | 14 #include "base/string_tokenizer.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "base/values.h" | 16 #include "base/values.h" |
| 17 #include "chrome/common/child_process_logging.h" | 17 #include "chrome/common/child_process_logging.h" |
| 18 #include "chrome/common/chrome_content_client.h" | 18 #include "chrome/common/chrome_content_client.h" |
| 19 #include "chrome/common/chrome_paths.h" | 19 #include "chrome/common/chrome_paths.h" |
| 20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/content_settings_pattern.h" | 21 #include "chrome/common/content_settings_pattern.h" |
| 22 #include "chrome/common/extensions/api/extension_action/page_action_handler.h" |
| 22 #include "chrome/common/extensions/extension.h" | 23 #include "chrome/common/extensions/extension.h" |
| 23 #include "chrome/common/extensions/extension_constants.h" | 24 #include "chrome/common/extensions/extension_constants.h" |
| 24 #include "chrome/common/extensions/extension_manifest_constants.h" | 25 #include "chrome/common/extensions/extension_manifest_constants.h" |
| 25 #include "chrome/common/extensions/extension_process_policy.h" | 26 #include "chrome/common/extensions/extension_process_policy.h" |
| 26 #include "chrome/common/extensions/extension_set.h" | 27 #include "chrome/common/extensions/extension_set.h" |
| 27 #include "chrome/common/extensions/manifest_handler.h" | 28 #include "chrome/common/extensions/manifest_handler.h" |
| 28 #include "chrome/common/extensions/manifest_url_handler.h" | 29 #include "chrome/common/extensions/manifest_url_handler.h" |
| 29 #include "chrome/common/extensions/web_accessible_resources_handler.h" | 30 #include "chrome/common/extensions/web_accessible_resources_handler.h" |
| 30 #include "chrome/common/external_ipc_fuzzer.h" | 31 #include "chrome/common/external_ipc_fuzzer.h" |
| 31 #include "chrome/common/localized_error.h" | 32 #include "chrome/common/localized_error.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 123 |
| 123 // Explicitly register all extension ManifestHandlers needed to parse | 124 // Explicitly register all extension ManifestHandlers needed to parse |
| 124 // fields used in the renderer. | 125 // fields used in the renderer. |
| 125 void RegisterExtensionManifestHandlers() { | 126 void RegisterExtensionManifestHandlers() { |
| 126 extensions::ManifestHandler::Register( | 127 extensions::ManifestHandler::Register( |
| 127 extension_manifest_keys::kDevToolsPage, | 128 extension_manifest_keys::kDevToolsPage, |
| 128 new extensions::DevToolsPageHandler); | 129 new extensions::DevToolsPageHandler); |
| 129 extensions::ManifestHandler::Register( | 130 extensions::ManifestHandler::Register( |
| 130 extension_manifest_keys::kWebAccessibleResources, | 131 extension_manifest_keys::kWebAccessibleResources, |
| 131 new extensions::WebAccessibleResourcesHandler); | 132 new extensions::WebAccessibleResourcesHandler); |
| 133 extensions::ManifestMultiKeyHandler::Register( |
| 134 new extensions::PageActionHandler); |
| 132 } | 135 } |
| 133 | 136 |
| 134 static void AppendParams(const std::vector<string16>& additional_names, | 137 static void AppendParams(const std::vector<string16>& additional_names, |
| 135 const std::vector<string16>& additional_values, | 138 const std::vector<string16>& additional_values, |
| 136 WebVector<WebString>* existing_names, | 139 WebVector<WebString>* existing_names, |
| 137 WebVector<WebString>* existing_values) { | 140 WebVector<WebString>* existing_values) { |
| 138 DCHECK(additional_names.size() == additional_values.size()); | 141 DCHECK(additional_names.size() == additional_values.size()); |
| 139 DCHECK(existing_names->size() == existing_values->size()); | 142 DCHECK(existing_names->size() == existing_values->size()); |
| 140 | 143 |
| 141 size_t existing_size = existing_names->size(); | 144 size_t existing_size = existing_names->size(); |
| (...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 } | 1039 } |
| 1037 | 1040 |
| 1038 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( | 1041 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( |
| 1039 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { | 1042 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { |
| 1040 #if defined(ENABLE_PLUGINS) | 1043 #if defined(ENABLE_PLUGINS) |
| 1041 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); | 1044 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); |
| 1042 #endif | 1045 #endif |
| 1043 } | 1046 } |
| 1044 | 1047 |
| 1045 } // namespace chrome | 1048 } // namespace chrome |
| OLD | NEW |