Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/chrome_content_browser_client_parts.h" 42 #include "chrome/browser/chrome_content_browser_client_parts.h"
43 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 43 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
44 #include "chrome/browser/chrome_quota_permission_context.h" 44 #include "chrome/browser/chrome_quota_permission_context.h"
45 #include "chrome/browser/content_settings/cookie_settings_factory.h" 45 #include "chrome/browser/content_settings/cookie_settings_factory.h"
46 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 46 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
47 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 47 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
48 #include "chrome/browser/defaults.h" 48 #include "chrome/browser/defaults.h"
49 #include "chrome/browser/download/download_prefs.h" 49 #include "chrome/browser/download/download_prefs.h"
50 #include "chrome/browser/engagement/site_engagement_eviction_policy.h" 50 #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
51 #include "chrome/browser/font_family_cache.h" 51 #include "chrome/browser/font_family_cache.h"
52 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 52 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
53 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 53 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
54 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 54 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
55 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 55 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
56 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" 56 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
57 #include "chrome/browser/notifications/platform_notification_service_impl.h" 57 #include "chrome/browser/notifications/platform_notification_service_impl.h"
58 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h" 58 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h"
59 #include "chrome/browser/password_manager/chrome_password_manager_client.h" 59 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
60 #include "chrome/browser/permissions/permission_context_base.h" 60 #include "chrome/browser/permissions/permission_context_base.h"
61 #include "chrome/browser/platform_util.h" 61 #include "chrome/browser/platform_util.h"
62 #include "chrome/browser/prerender/prerender_final_status.h" 62 #include "chrome/browser/prerender/prerender_final_status.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 #if defined(ENABLE_SPELLCHECK) 309 #if defined(ENABLE_SPELLCHECK)
310 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 310 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
311 #endif 311 #endif
312 312
313 #if defined(USE_BROWSER_SPELLCHECKER) 313 #if defined(USE_BROWSER_SPELLCHECKER)
314 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h" 314 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
315 #endif 315 #endif
316 316
317 #if defined(ENABLE_WEBRTC) 317 #if defined(ENABLE_WEBRTC)
318 #include "chrome/browser/media/audio_debug_recordings_handler.h" 318 #include "chrome/browser/media/audio_debug_recordings_handler.h"
319 #include "chrome/browser/media/webrtc_event_log_handler.h" 319 #include "chrome/browser/media/webrtc/webrtc_event_log_handler.h"
320 #include "chrome/browser/media/webrtc_logging_handler_host.h" 320 #include "chrome/browser/media/webrtc/webrtc_logging_handler_host.h"
321 #endif 321 #endif
322 322
323 #if defined(ENABLE_MEDIA_ROUTER) 323 #if defined(ENABLE_MEDIA_ROUTER)
324 #include "chrome/browser/media/router/media_router_feature.h" 324 #include "chrome/browser/media/router/media_router_feature.h"
325 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 325 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
326 #endif 326 #endif
327 327
328 #if defined(ENABLE_WAYLAND_SERVER) 328 #if defined(ENABLE_WAYLAND_SERVER)
329 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 329 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
330 #endif 330 #endif
(...skipping 2847 matching lines...) Expand 10 before | Expand all | Expand 10 after
3178 if (channel <= kMaxDisableEncryptionChannel) { 3178 if (channel <= kMaxDisableEncryptionChannel) {
3179 static const char* const kWebRtcDevSwitchNames[] = { 3179 static const char* const kWebRtcDevSwitchNames[] = {
3180 switches::kDisableWebRtcEncryption, 3180 switches::kDisableWebRtcEncryption,
3181 }; 3181 };
3182 to_command_line->CopySwitchesFrom(from_command_line, 3182 to_command_line->CopySwitchesFrom(from_command_line,
3183 kWebRtcDevSwitchNames, 3183 kWebRtcDevSwitchNames,
3184 arraysize(kWebRtcDevSwitchNames)); 3184 arraysize(kWebRtcDevSwitchNames));
3185 } 3185 }
3186 } 3186 }
3187 #endif // defined(ENABLE_WEBRTC) 3187 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698