| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 #include "ui/base/l10n/l10n_util.h" | 107 #include "ui/base/l10n/l10n_util.h" |
| 108 #include "ui/base/layout.h" | 108 #include "ui/base/layout.h" |
| 109 #include "ui/base/resource/resource_bundle.h" | 109 #include "ui/base/resource/resource_bundle.h" |
| 110 #include "ui/base/webui/jstemplate_builder.h" | 110 #include "ui/base/webui/jstemplate_builder.h" |
| 111 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 111 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
| 112 | 112 |
| 113 #if !defined(DISABLE_NACL) | 113 #if !defined(DISABLE_NACL) |
| 114 #include "components/nacl/renderer/nacl_helper.h" | 114 #include "components/nacl/renderer/nacl_helper.h" |
| 115 #endif | 115 #endif |
| 116 | 116 |
| 117 #if defined(ENABLE_WEBRTC) | 117 #if defined(ENABLE_EXTENSIONS) |
| 118 #include "chrome/renderer/media/webrtc_logging_message_filter.h" | 118 #include "chrome/renderer/extensions/chrome_extensions_render_frame_observer.h" |
| 119 #endif | 119 #endif |
| 120 | 120 |
| 121 #if defined(ENABLE_SPELLCHECK) | 121 #if defined(ENABLE_SPELLCHECK) |
| 122 #include "chrome/renderer/spellchecker/spellcheck.h" | 122 #include "chrome/renderer/spellchecker/spellcheck.h" |
| 123 #include "chrome/renderer/spellchecker/spellcheck_provider.h" | 123 #include "chrome/renderer/spellchecker/spellcheck_provider.h" |
| 124 #endif | 124 #endif |
| 125 | 125 |
| 126 #if defined(ENABLE_WEBRTC) |
| 127 #include "chrome/renderer/media/webrtc_logging_message_filter.h" |
| 128 #endif |
| 129 |
| 126 #if defined(OS_WIN) | 130 #if defined(OS_WIN) |
| 127 #include "chrome_elf/blacklist/blacklist.h" | 131 #include "chrome_elf/blacklist/blacklist.h" |
| 128 #endif // OS_WIN | 132 #endif |
| 129 | 133 |
| 130 using autofill::AutofillAgent; | 134 using autofill::AutofillAgent; |
| 131 using autofill::PasswordAutofillAgent; | 135 using autofill::PasswordAutofillAgent; |
| 132 using autofill::PasswordGenerationAgent; | 136 using autofill::PasswordGenerationAgent; |
| 133 using base::ASCIIToUTF16; | 137 using base::ASCIIToUTF16; |
| 134 using base::UserMetricsAction; | 138 using base::UserMetricsAction; |
| 135 using content::RenderThread; | 139 using content::RenderThread; |
| 136 using content::WebPluginInfo; | 140 using content::WebPluginInfo; |
| 137 using extensions::Extension; | 141 using extensions::Extension; |
| 138 using blink::WebCache; | 142 using blink::WebCache; |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 content::RenderFrame* render_frame) { | 391 content::RenderFrame* render_frame) { |
| 388 new ChromeRenderFrameObserver(render_frame); | 392 new ChromeRenderFrameObserver(render_frame); |
| 389 | 393 |
| 390 ContentSettingsObserver* content_settings = | 394 ContentSettingsObserver* content_settings = |
| 391 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); | 395 new ContentSettingsObserver(render_frame, extension_dispatcher_.get()); |
| 392 if (chrome_observer_.get()) { | 396 if (chrome_observer_.get()) { |
| 393 content_settings->SetContentSettingRules( | 397 content_settings->SetContentSettingRules( |
| 394 chrome_observer_->content_setting_rules()); | 398 chrome_observer_->content_setting_rules()); |
| 395 } | 399 } |
| 396 | 400 |
| 401 #if defined(ENABLE_EXTENSIONS) |
| 402 new extensions::ChromeExtensionsRenderFrameObserver(render_frame); |
| 403 #endif |
| 397 new extensions::ExtensionFrameHelper(render_frame, | 404 new extensions::ExtensionFrameHelper(render_frame, |
| 398 extension_dispatcher_.get()); | 405 extension_dispatcher_.get()); |
| 399 | 406 |
| 400 #if defined(ENABLE_PLUGINS) | 407 #if defined(ENABLE_PLUGINS) |
| 401 new PepperHelper(render_frame); | 408 new PepperHelper(render_frame); |
| 402 #endif | 409 #endif |
| 403 | 410 |
| 404 #if !defined(DISABLE_NACL) | 411 #if !defined(DISABLE_NACL) |
| 405 new nacl::NaClHelper(render_frame); | 412 new nacl::NaClHelper(render_frame); |
| 406 #endif | 413 #endif |
| (...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1451 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1458 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 1452 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); | 1459 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); |
| 1453 } | 1460 } |
| 1454 | 1461 |
| 1455 blink::WebWorkerPermissionClientProxy* | 1462 blink::WebWorkerPermissionClientProxy* |
| 1456 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1463 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
| 1457 content::RenderFrame* render_frame, | 1464 content::RenderFrame* render_frame, |
| 1458 blink::WebFrame* frame) { | 1465 blink::WebFrame* frame) { |
| 1459 return new WorkerPermissionClientProxy(render_frame, frame); | 1466 return new WorkerPermissionClientProxy(render_frame, frame); |
| 1460 } | 1467 } |
| OLD | NEW |