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 16 matching lines...) Expand all Loading... |
27 #include "chrome/common/render_messages.h" | 27 #include "chrome/common/render_messages.h" |
28 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
29 #include "chrome/renderer/benchmarking_extension.h" | 29 #include "chrome/renderer/benchmarking_extension.h" |
30 #include "chrome/renderer/chrome_render_frame_observer.h" | 30 #include "chrome/renderer/chrome_render_frame_observer.h" |
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_frame_helper.h" |
37 #include "chrome/renderer/extensions/extension_helper.h" | 38 #include "chrome/renderer/extensions/extension_helper.h" |
38 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" | 39 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" |
39 #include "chrome/renderer/extensions/resource_request_policy.h" | 40 #include "chrome/renderer/extensions/resource_request_policy.h" |
40 #include "chrome/renderer/external_extension.h" | 41 #include "chrome/renderer/external_extension.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" |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 content::RenderFrame* render_frame) { | 352 content::RenderFrame* render_frame) { |
352 new ChromeRenderFrameObserver(render_frame); | 353 new ChromeRenderFrameObserver(render_frame); |
353 | 354 |
354 ContentSettingsObserver* content_settings = | 355 ContentSettingsObserver* content_settings = |
355 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); | 356 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); |
356 if (chrome_observer_.get()) { | 357 if (chrome_observer_.get()) { |
357 content_settings->SetContentSettingRules( | 358 content_settings->SetContentSettingRules( |
358 chrome_observer_->content_setting_rules()); | 359 chrome_observer_->content_setting_rules()); |
359 } | 360 } |
360 | 361 |
| 362 new extensions::ExtensionFrameHelper(render_frame); |
| 363 |
361 #if defined(ENABLE_PLUGINS) | 364 #if defined(ENABLE_PLUGINS) |
362 new PepperHelper(render_frame); | 365 new PepperHelper(render_frame); |
363 #endif | 366 #endif |
364 } | 367 } |
365 | 368 |
366 void ChromeContentRendererClient::RenderViewCreated( | 369 void ChromeContentRendererClient::RenderViewCreated( |
367 content::RenderView* render_view) { | 370 content::RenderView* render_view) { |
368 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); | 371 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); |
369 new PageLoadHistograms(render_view); | 372 new PageLoadHistograms(render_view); |
370 #if defined(ENABLE_PRINTING) | 373 #if defined(ENABLE_PRINTING) |
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1367 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1370 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
1368 return !command_line->HasSwitch(switches::kExtensionProcess); | 1371 return !command_line->HasSwitch(switches::kExtensionProcess); |
1369 } | 1372 } |
1370 | 1373 |
1371 blink::WebWorkerPermissionClientProxy* | 1374 blink::WebWorkerPermissionClientProxy* |
1372 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1375 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
1373 content::RenderFrame* render_frame, | 1376 content::RenderFrame* render_frame, |
1374 blink::WebFrame* frame) { | 1377 blink::WebFrame* frame) { |
1375 return new WorkerPermissionClientProxy(render_frame, frame); | 1378 return new WorkerPermissionClientProxy(render_frame, frame); |
1376 } | 1379 } |
OLD | NEW |