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 15 matching lines...) Expand all Loading... |
26 #include "chrome/common/render_messages.h" | 26 #include "chrome/common/render_messages.h" |
27 #include "chrome/common/url_constants.h" | 27 #include "chrome/common/url_constants.h" |
28 #include "chrome/renderer/benchmarking_extension.h" | 28 #include "chrome/renderer/benchmarking_extension.h" |
29 #include "chrome/renderer/chrome_render_frame_observer.h" | 29 #include "chrome/renderer/chrome_render_frame_observer.h" |
30 #include "chrome/renderer/chrome_render_process_observer.h" | 30 #include "chrome/renderer/chrome_render_process_observer.h" |
31 #include "chrome/renderer/chrome_render_view_observer.h" | 31 #include "chrome/renderer/chrome_render_view_observer.h" |
32 #include "chrome/renderer/content_settings_observer.h" | 32 #include "chrome/renderer/content_settings_observer.h" |
33 #include "chrome/renderer/extensions/chrome_v8_context.h" | 33 #include "chrome/renderer/extensions/chrome_v8_context.h" |
34 #include "chrome/renderer/extensions/chrome_v8_extension.h" | 34 #include "chrome/renderer/extensions/chrome_v8_extension.h" |
35 #include "chrome/renderer/extensions/dispatcher.h" | 35 #include "chrome/renderer/extensions/dispatcher.h" |
| 36 #include "chrome/renderer/extensions/extension_frame_helper.h" |
36 #include "chrome/renderer/extensions/extension_helper.h" | 37 #include "chrome/renderer/extensions/extension_helper.h" |
37 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" | 38 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" |
38 #include "chrome/renderer/extensions/resource_request_policy.h" | 39 #include "chrome/renderer/extensions/resource_request_policy.h" |
39 #include "chrome/renderer/external_extension.h" | 40 #include "chrome/renderer/external_extension.h" |
40 #include "chrome/renderer/loadtimes_extension_bindings.h" | 41 #include "chrome/renderer/loadtimes_extension_bindings.h" |
41 #include "chrome/renderer/media/chrome_key_systems.h" | 42 #include "chrome/renderer/media/chrome_key_systems.h" |
42 #include "chrome/renderer/net/net_error_helper.h" | 43 #include "chrome/renderer/net/net_error_helper.h" |
43 #include "chrome/renderer/net/prescient_networking_dispatcher.h" | 44 #include "chrome/renderer/net/prescient_networking_dispatcher.h" |
44 #include "chrome/renderer/net/renderer_net_predictor.h" | 45 #include "chrome/renderer/net/renderer_net_predictor.h" |
45 #include "chrome/renderer/net_benchmarking_extension.h" | 46 #include "chrome/renderer/net_benchmarking_extension.h" |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 content::RenderFrame* render_frame) { | 351 content::RenderFrame* render_frame) { |
351 new ChromeRenderFrameObserver(render_frame); | 352 new ChromeRenderFrameObserver(render_frame); |
352 | 353 |
353 ContentSettingsObserver* content_settings = | 354 ContentSettingsObserver* content_settings = |
354 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); | 355 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); |
355 if (chrome_observer_.get()) { | 356 if (chrome_observer_.get()) { |
356 content_settings->SetContentSettingRules( | 357 content_settings->SetContentSettingRules( |
357 chrome_observer_->content_setting_rules()); | 358 chrome_observer_->content_setting_rules()); |
358 } | 359 } |
359 | 360 |
| 361 new extensions::ExtensionFrameHelper(render_frame); |
| 362 |
360 #if defined(ENABLE_PLUGINS) | 363 #if defined(ENABLE_PLUGINS) |
361 new PepperHelper(render_frame); | 364 new PepperHelper(render_frame); |
362 #endif | 365 #endif |
363 } | 366 } |
364 | 367 |
365 void ChromeContentRendererClient::RenderViewCreated( | 368 void ChromeContentRendererClient::RenderViewCreated( |
366 content::RenderView* render_view) { | 369 content::RenderView* render_view) { |
367 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); | 370 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); |
368 new PageLoadHistograms(render_view); | 371 new PageLoadHistograms(render_view); |
369 #if defined(ENABLE_PRINTING) | 372 #if defined(ENABLE_PRINTING) |
(...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1355 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1358 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
1356 return !command_line->HasSwitch(switches::kExtensionProcess); | 1359 return !command_line->HasSwitch(switches::kExtensionProcess); |
1357 } | 1360 } |
1358 | 1361 |
1359 blink::WebWorkerPermissionClientProxy* | 1362 blink::WebWorkerPermissionClientProxy* |
1360 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1363 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
1361 content::RenderFrame* render_frame, | 1364 content::RenderFrame* render_frame, |
1362 blink::WebFrame* frame) { | 1365 blink::WebFrame* frame) { |
1363 return new WorkerPermissionClientProxy(render_frame, frame); | 1366 return new WorkerPermissionClientProxy(render_frame, frame); |
1364 } | 1367 } |
OLD | NEW |