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

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

Issue 2272213003: DevTools: remove devtools_discovery (merged into content). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix 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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/devtools/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28 matching lines...) Expand all
39 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" 39 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h"
40 #include "chrome/browser/budget_service/budget_service_impl.h" 40 #include "chrome/browser/budget_service/budget_service_impl.h"
41 #include "chrome/browser/character_encoding.h" 41 #include "chrome/browser/character_encoding.h"
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/devtools/chrome_devtools_manager_delegate.h"
50 #include "chrome/browser/download/download_prefs.h" 49 #include "chrome/browser/download/download_prefs.h"
51 #include "chrome/browser/engagement/site_engagement_eviction_policy.h" 50 #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
52 #include "chrome/browser/font_family_cache.h" 51 #include "chrome/browser/font_family_cache.h"
53 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 52 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
54 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 53 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
55 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 54 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
56 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 55 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
57 #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"
58 #include "chrome/browser/notifications/platform_notification_service_impl.h" 57 #include "chrome/browser/notifications/platform_notification_service_impl.h"
59 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h" 58 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 #endif 230 #endif
232 231
233 #if BUILDFLAG(ANDROID_JAVA_UI) 232 #if BUILDFLAG(ANDROID_JAVA_UI)
234 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h" 233 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
235 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h" 234 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
236 #include "chrome/browser/android/service_tab_launcher.h" 235 #include "chrome/browser/android/service_tab_launcher.h"
237 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 236 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
238 #endif 237 #endif
239 238
240 #if defined(OS_ANDROID) 239 #if defined(OS_ANDROID)
240 #include "chrome/browser/android/devtools_manager_delegate_android.h"
241 #include "ui/base/ui_base_paths.h" 241 #include "ui/base/ui_base_paths.h"
242 #include "ui/gfx/android/device_display_info.h" 242 #include "ui/gfx/android/device_display_info.h"
243 #else
244 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
243 #endif 245 #endif
244 246
245 #if defined(TOOLKIT_VIEWS) 247 #if defined(TOOLKIT_VIEWS)
246 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 248 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
247 #endif 249 #endif
248 250
249 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 251 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
250 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" 252 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
251 #endif 253 #endif
252 254
(...skipping 2828 matching lines...) Expand 10 before | Expand all | Expand 10 after
3081 throttles.push_back( 3083 throttles.push_back(
3082 subresource_filter::SubresourceFilterNavigationThrottle::Create( 3084 subresource_filter::SubresourceFilterNavigationThrottle::Create(
3083 handle)); 3085 handle));
3084 } 3086 }
3085 3087
3086 return throttles; 3088 return throttles;
3087 } 3089 }
3088 3090
3089 content::DevToolsManagerDelegate* 3091 content::DevToolsManagerDelegate*
3090 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 3092 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
3093 #if defined(OS_ANDROID)
3094 return new DevToolsManagerDelegateAndroid();
3095 #else
3091 return new ChromeDevToolsManagerDelegate(); 3096 return new ChromeDevToolsManagerDelegate();
3097 #endif
3092 } 3098 }
3093 3099
3094 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { 3100 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
3095 return new ChromeTracingDelegate(); 3101 return new ChromeTracingDelegate();
3096 } 3102 }
3097 3103
3098 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 3104 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
3099 content::BrowserContext* browser_context, 3105 content::BrowserContext* browser_context,
3100 const GURL& url) { 3106 const GURL& url) {
3101 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 3107 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
3153 if (channel <= kMaxDisableEncryptionChannel) { 3159 if (channel <= kMaxDisableEncryptionChannel) {
3154 static const char* const kWebRtcDevSwitchNames[] = { 3160 static const char* const kWebRtcDevSwitchNames[] = {
3155 switches::kDisableWebRtcEncryption, 3161 switches::kDisableWebRtcEncryption,
3156 }; 3162 };
3157 to_command_line->CopySwitchesFrom(from_command_line, 3163 to_command_line->CopySwitchesFrom(from_command_line,
3158 kWebRtcDevSwitchNames, 3164 kWebRtcDevSwitchNames,
3159 arraysize(kWebRtcDevSwitchNames)); 3165 arraysize(kWebRtcDevSwitchNames));
3160 } 3166 }
3161 } 3167 }
3162 #endif // defined(ENABLE_WEBRTC) 3168 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/devtools/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698