| 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 <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/grit/generated_resources.h" | 32 #include "chrome/grit/generated_resources.h" |
| 33 #include "chrome/grit/locale_settings.h" | 33 #include "chrome/grit/locale_settings.h" |
| 34 #include "chrome/grit/renderer_resources.h" | 34 #include "chrome/grit/renderer_resources.h" |
| 35 #include "chrome/renderer/app_categorizer.h" | 35 #include "chrome/renderer/app_categorizer.h" |
| 36 #include "chrome/renderer/banners/app_banner_client.h" | 36 #include "chrome/renderer/banners/app_banner_client.h" |
| 37 #include "chrome/renderer/benchmarking_extension.h" | 37 #include "chrome/renderer/benchmarking_extension.h" |
| 38 #include "chrome/renderer/chrome_render_frame_observer.h" | 38 #include "chrome/renderer/chrome_render_frame_observer.h" |
| 39 #include "chrome/renderer/chrome_render_thread_observer.h" | 39 #include "chrome/renderer/chrome_render_thread_observer.h" |
| 40 #include "chrome/renderer/chrome_render_view_observer.h" | 40 #include "chrome/renderer/chrome_render_view_observer.h" |
| 41 #include "chrome/renderer/content_settings_observer.h" | 41 #include "chrome/renderer/content_settings_observer.h" |
| 42 #include "chrome/renderer/external_extension.h" | |
| 43 #include "chrome/renderer/loadtimes_extension_bindings.h" | 42 #include "chrome/renderer/loadtimes_extension_bindings.h" |
| 44 #include "chrome/renderer/media/chrome_key_systems.h" | 43 #include "chrome/renderer/media/chrome_key_systems.h" |
| 45 #include "chrome/renderer/net/net_error_helper.h" | 44 #include "chrome/renderer/net/net_error_helper.h" |
| 46 #include "chrome/renderer/net_benchmarking_extension.h" | 45 #include "chrome/renderer/net_benchmarking_extension.h" |
| 47 #include "chrome/renderer/page_load_histograms.h" | 46 #include "chrome/renderer/page_load_histograms.h" |
| 48 #include "chrome/renderer/pepper/pepper_helper.h" | 47 #include "chrome/renderer/pepper/pepper_helper.h" |
| 49 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" | 48 #include "chrome/renderer/plugins/non_loadable_plugin_placeholder.h" |
| 50 #include "chrome/renderer/plugins/plugin_preroller.h" | 49 #include "chrome/renderer/plugins/plugin_preroller.h" |
| 51 #include "chrome/renderer/plugins/plugin_uma.h" | 50 #include "chrome/renderer/plugins/plugin_uma.h" |
| 52 #include "chrome/renderer/prerender/prerender_dispatcher.h" | 51 #include "chrome/renderer/prerender/prerender_dispatcher.h" |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 #endif | 369 #endif |
| 371 thread->AddObserver(visited_link_slave_.get()); | 370 thread->AddObserver(visited_link_slave_.get()); |
| 372 thread->AddObserver(prerender_dispatcher_.get()); | 371 thread->AddObserver(prerender_dispatcher_.get()); |
| 373 thread->AddObserver(subresource_filter_ruleset_dealer_.get()); | 372 thread->AddObserver(subresource_filter_ruleset_dealer_.get()); |
| 374 thread->AddObserver(SearchBouncer::GetInstance()); | 373 thread->AddObserver(SearchBouncer::GetInstance()); |
| 375 | 374 |
| 376 #if defined(ENABLE_WEBRTC) | 375 #if defined(ENABLE_WEBRTC) |
| 377 thread->AddFilter(webrtc_logging_message_filter_.get()); | 376 thread->AddFilter(webrtc_logging_message_filter_.get()); |
| 378 #endif | 377 #endif |
| 379 | 378 |
| 380 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); | |
| 381 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); | 379 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); |
| 382 | 380 |
| 383 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 381 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 384 if (command_line->HasSwitch(switches::kEnableBenchmarking)) | 382 if (command_line->HasSwitch(switches::kEnableBenchmarking)) |
| 385 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); | 383 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); |
| 386 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) | 384 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) |
| 387 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); | 385 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); |
| 388 if (command_line->HasSwitch(switches::kInstantProcess)) | 386 if (command_line->HasSwitch(switches::kInstantProcess)) |
| 389 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); | 387 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); |
| 390 | 388 |
| (...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1374 // chrome.system.network.getNetworkInterfaces provides the same | 1372 // chrome.system.network.getNetworkInterfaces provides the same |
| 1375 // information. Also, the enforcement of sending and binding UDP is already done | 1373 // information. Also, the enforcement of sending and binding UDP is already done |
| 1376 // by chrome extension permission model. | 1374 // by chrome extension permission model. |
| 1377 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { | 1375 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { |
| 1378 #if defined(ENABLE_EXTENSIONS) | 1376 #if defined(ENABLE_EXTENSIONS) |
| 1379 return !IsStandaloneExtensionProcess(); | 1377 return !IsStandaloneExtensionProcess(); |
| 1380 #else | 1378 #else |
| 1381 return true; | 1379 return true; |
| 1382 #endif | 1380 #endif |
| 1383 } | 1381 } |
| OLD | NEW |