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 20 matching lines...) Expand all Loading... |
31 #include "chrome/renderer/chrome_render_process_observer.h" | 31 #include "chrome/renderer/chrome_render_process_observer.h" |
32 #include "chrome/renderer/chrome_render_view_observer.h" | 32 #include "chrome/renderer/chrome_render_view_observer.h" |
33 #include "chrome/renderer/content_settings_observer.h" | 33 #include "chrome/renderer/content_settings_observer.h" |
34 #include "chrome/renderer/extensions/chrome_v8_context.h" | 34 #include "chrome/renderer/extensions/chrome_v8_context.h" |
35 #include "chrome/renderer/extensions/chrome_v8_extension.h" | 35 #include "chrome/renderer/extensions/chrome_v8_extension.h" |
36 #include "chrome/renderer/extensions/dispatcher.h" | 36 #include "chrome/renderer/extensions/dispatcher.h" |
37 #include "chrome/renderer/extensions/extension_helper.h" | 37 #include "chrome/renderer/extensions/extension_helper.h" |
38 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" | 38 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" |
39 #include "chrome/renderer/extensions/resource_request_policy.h" | 39 #include "chrome/renderer/extensions/resource_request_policy.h" |
40 #include "chrome/renderer/external_extension.h" | 40 #include "chrome/renderer/external_extension.h" |
| 41 #include "chrome/renderer/in_renderer_worker_permission_client_proxy.h" |
41 #include "chrome/renderer/loadtimes_extension_bindings.h" | 42 #include "chrome/renderer/loadtimes_extension_bindings.h" |
42 #include "chrome/renderer/media/chrome_key_systems.h" | 43 #include "chrome/renderer/media/chrome_key_systems.h" |
43 #include "chrome/renderer/net/net_error_helper.h" | 44 #include "chrome/renderer/net/net_error_helper.h" |
44 #include "chrome/renderer/net/prescient_networking_dispatcher.h" | 45 #include "chrome/renderer/net/prescient_networking_dispatcher.h" |
45 #include "chrome/renderer/net/renderer_net_predictor.h" | 46 #include "chrome/renderer/net/renderer_net_predictor.h" |
46 #include "chrome/renderer/net_benchmarking_extension.h" | 47 #include "chrome/renderer/net_benchmarking_extension.h" |
47 #include "chrome/renderer/page_load_histograms.h" | 48 #include "chrome/renderer/page_load_histograms.h" |
48 #include "chrome/renderer/pepper/pepper_helper.h" | 49 #include "chrome/renderer/pepper/pepper_helper.h" |
49 #include "chrome/renderer/pepper/ppb_nacl_private_impl.h" | 50 #include "chrome/renderer/pepper/ppb_nacl_private_impl.h" |
50 #include "chrome/renderer/pepper/ppb_pdf_impl.h" | 51 #include "chrome/renderer/pepper/ppb_pdf_impl.h" |
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1386 bool ChromeContentRendererClient::ShouldEnableSiteIsolationPolicy() const { | 1387 bool ChromeContentRendererClient::ShouldEnableSiteIsolationPolicy() const { |
1387 // SiteIsolationPolicy is off by default. We would like to activate cross-site | 1388 // SiteIsolationPolicy is off by default. We would like to activate cross-site |
1388 // document blocking (for UMA data collection) for normal renderer processes | 1389 // document blocking (for UMA data collection) for normal renderer processes |
1389 // running a normal web page from the Internet. We only turn on | 1390 // running a normal web page from the Internet. We only turn on |
1390 // SiteIsolationPolicy for a renderer process that does not have the extension | 1391 // SiteIsolationPolicy for a renderer process that does not have the extension |
1391 // flag on. | 1392 // flag on. |
1392 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1393 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
1393 return !command_line->HasSwitch(switches::kExtensionProcess); | 1394 return !command_line->HasSwitch(switches::kExtensionProcess); |
1394 } | 1395 } |
1395 | 1396 |
| 1397 WebKit::WebWorkerPermissionClientProxy* |
| 1398 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
| 1399 WebKit::WebFrame* frame, int routing_id) { |
| 1400 return new InRendererWorkerPermissionClientProxy(frame, routing_id); |
| 1401 } |
| 1402 |
1396 } // namespace chrome | 1403 } // namespace chrome |
OLD | NEW |