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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
387 content::RenderFrame* render_frame) { | 387 content::RenderFrame* render_frame) { |
388 new ChromeRenderFrameObserver(render_frame); | 388 new ChromeRenderFrameObserver(render_frame); |
389 | 389 |
390 ContentSettingsObserver* content_settings = | 390 ContentSettingsObserver* content_settings = |
391 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); | 391 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); |
392 if (chrome_observer_.get()) { | 392 if (chrome_observer_.get()) { |
393 content_settings->SetContentSettingRules( | 393 content_settings->SetContentSettingRules( |
394 chrome_observer_->content_setting_rules()); | 394 chrome_observer_->content_setting_rules()); |
395 } | 395 } |
396 | 396 |
397 #if defined(ENABLE_EXTENSIONS) | |
398 new ChromeRenderFrameObserver(render_frame); | |
Devlin
2014/06/06 20:57:23
Did you mean ChromeExtensionsRenderFrameObserver?
Lei Zhang
2014/06/06 21:31:35
Yes. Copy paste error.
| |
399 #endif | |
397 new extensions::ExtensionFrameHelper(render_frame, | 400 new extensions::ExtensionFrameHelper(render_frame, |
398 extension_dispatcher_.get()); | 401 extension_dispatcher_.get()); |
399 | 402 |
400 #if defined(ENABLE_PLUGINS) | 403 #if defined(ENABLE_PLUGINS) |
401 new PepperHelper(render_frame); | 404 new PepperHelper(render_frame); |
402 #endif | 405 #endif |
403 | 406 |
404 #if !defined(DISABLE_NACL) | 407 #if !defined(DISABLE_NACL) |
405 new nacl::NaClHelper(render_frame); | 408 new nacl::NaClHelper(render_frame); |
406 #endif | 409 #endif |
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1451 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1454 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
1452 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); | 1455 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); |
1453 } | 1456 } |
1454 | 1457 |
1455 blink::WebWorkerPermissionClientProxy* | 1458 blink::WebWorkerPermissionClientProxy* |
1456 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1459 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
1457 content::RenderFrame* render_frame, | 1460 content::RenderFrame* render_frame, |
1458 blink::WebFrame* frame) { | 1461 blink::WebFrame* frame) { |
1459 return new WorkerPermissionClientProxy(render_frame, frame); | 1462 return new WorkerPermissionClientProxy(render_frame, frame); |
1460 } | 1463 } |
OLD | NEW |