| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/common/localized_error.h" | 25 #include "chrome/common/localized_error.h" |
| 26 #include "chrome/common/pepper_permission_util.h" | 26 #include "chrome/common/pepper_permission_util.h" |
| 27 #include "chrome/common/profile_management_switches.h" | 27 #include "chrome/common/profile_management_switches.h" |
| 28 #include "chrome/common/render_messages.h" | 28 #include "chrome/common/render_messages.h" |
| 29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
| 30 #include "chrome/renderer/benchmarking_extension.h" | 30 #include "chrome/renderer/benchmarking_extension.h" |
| 31 #include "chrome/renderer/chrome_render_frame_observer.h" | 31 #include "chrome/renderer/chrome_render_frame_observer.h" |
| 32 #include "chrome/renderer/chrome_render_process_observer.h" | 32 #include "chrome/renderer/chrome_render_process_observer.h" |
| 33 #include "chrome/renderer/chrome_render_view_observer.h" | 33 #include "chrome/renderer/chrome_render_view_observer.h" |
| 34 #include "chrome/renderer/content_settings_observer.h" | 34 #include "chrome/renderer/content_settings_observer.h" |
| 35 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h" |
| 35 #include "chrome/renderer/extensions/chrome_v8_context.h" | 36 #include "chrome/renderer/extensions/chrome_v8_context.h" |
| 36 #include "chrome/renderer/extensions/chrome_v8_extension.h" | 37 #include "chrome/renderer/extensions/chrome_v8_extension.h" |
| 37 #include "chrome/renderer/extensions/dispatcher.h" | 38 #include "chrome/renderer/extensions/dispatcher.h" |
| 38 #include "chrome/renderer/extensions/extension_frame_helper.h" | 39 #include "chrome/renderer/extensions/extension_frame_helper.h" |
| 39 #include "chrome/renderer/extensions/extension_helper.h" | 40 #include "chrome/renderer/extensions/extension_helper.h" |
| 40 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" | 41 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" |
| 41 #include "chrome/renderer/extensions/resource_request_policy.h" | 42 #include "chrome/renderer/extensions/resource_request_policy.h" |
| 42 #include "chrome/renderer/external_extension.h" | 43 #include "chrome/renderer/external_extension.h" |
| 43 #include "chrome/renderer/loadtimes_extension_bindings.h" | 44 #include "chrome/renderer/loadtimes_extension_bindings.h" |
| 44 #include "chrome/renderer/media/cast_ipc_dispatcher.h" | 45 #include "chrome/renderer/media/cast_ipc_dispatcher.h" |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 | 355 |
| 355 // chrome-extension: resources should bypass Content Security Policy checks | 356 // chrome-extension: resources should bypass Content Security Policy checks |
| 356 // when included in protected resources. | 357 // when included in protected resources. |
| 357 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( | 358 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( |
| 358 extension_scheme); | 359 extension_scheme); |
| 359 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( | 360 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( |
| 360 extension_resource_scheme); | 361 extension_resource_scheme); |
| 361 | 362 |
| 362 extensions::ExtensionsClient::Set( | 363 extensions::ExtensionsClient::Set( |
| 363 extensions::ChromeExtensionsClient::GetInstance()); | 364 extensions::ChromeExtensionsClient::GetInstance()); |
| 365 extensions::ExtensionsRendererClient::Set( |
| 366 ChromeExtensionsRendererClient::GetInstance()); |
| 364 | 367 |
| 365 #if defined(OS_WIN) | 368 #if defined(OS_WIN) |
| 366 // Report if the renderer process has been patched by chrome_elf. | 369 // Report if the renderer process has been patched by chrome_elf. |
| 367 // TODO(csharp): Remove once the renderer is no longer getting | 370 // TODO(csharp): Remove once the renderer is no longer getting |
| 368 // patched this way. | 371 // patched this way. |
| 369 if (blacklist::IsBlacklistInitialized()) | 372 if (blacklist::IsBlacklistInitialized()) |
| 370 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); | 373 UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); |
| 371 #endif | 374 #endif |
| 372 } | 375 } |
| 373 | 376 |
| (...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1436 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1439 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 1437 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); | 1440 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); |
| 1438 } | 1441 } |
| 1439 | 1442 |
| 1440 blink::WebWorkerPermissionClientProxy* | 1443 blink::WebWorkerPermissionClientProxy* |
| 1441 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1444 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
| 1442 content::RenderFrame* render_frame, | 1445 content::RenderFrame* render_frame, |
| 1443 blink::WebFrame* frame) { | 1446 blink::WebFrame* frame) { |
| 1444 return new WorkerPermissionClientProxy(render_frame, frame); | 1447 return new WorkerPermissionClientProxy(render_frame, frame); |
| 1445 } | 1448 } |
| OLD | NEW |