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

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

Issue 1114503002: [DevTools] Cleanup DevToolsTarget and DevToolsManagerDelegate after moving to devtools_discovery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@devtools-discovery-chrome
Patch Set: Created 5 years, 7 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/android/dev_tools_server.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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/browser_shutdown.h" 26 #include "chrome/browser/browser_shutdown.h"
27 #include "chrome/browser/browsing_data/browsing_data_helper.h" 27 #include "chrome/browser/browsing_data/browsing_data_helper.h"
28 #include "chrome/browser/browsing_data/browsing_data_remover.h" 28 #include "chrome/browser/browsing_data/browsing_data_remover.h"
29 #include "chrome/browser/character_encoding.h" 29 #include "chrome/browser/character_encoding.h"
30 #include "chrome/browser/chrome_content_browser_client_parts.h" 30 #include "chrome/browser/chrome_content_browser_client_parts.h"
31 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 31 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
32 #include "chrome/browser/chrome_quota_permission_context.h" 32 #include "chrome/browser/chrome_quota_permission_context.h"
33 #include "chrome/browser/content_settings/cookie_settings.h" 33 #include "chrome/browser/content_settings/cookie_settings.h"
34 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 34 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
35 #include "chrome/browser/defaults.h" 35 #include "chrome/browser/defaults.h"
36 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
36 #include "chrome/browser/download/download_prefs.h" 37 #include "chrome/browser/download/download_prefs.h"
37 #include "chrome/browser/font_family_cache.h" 38 #include "chrome/browser/font_family_cache.h"
38 #include "chrome/browser/geolocation/chrome_access_token_store.h" 39 #include "chrome/browser/geolocation/chrome_access_token_store.h"
39 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 40 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
40 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 41 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
41 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 42 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
42 #include "chrome/browser/net/chrome_net_log.h" 43 #include "chrome/browser/net/chrome_net_log.h"
43 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 44 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
44 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" 45 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
45 #include "chrome/browser/notifications/platform_notification_service_impl.h" 46 #include "chrome/browser/notifications/platform_notification_service_impl.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 #include "base/debug/leak_annotations.h" 169 #include "base/debug/leak_annotations.h"
169 #include "components/crash/app/breakpad_linux.h" 170 #include "components/crash/app/breakpad_linux.h"
170 #include "components/crash/browser/crash_handler_host_linux.h" 171 #include "components/crash/browser/crash_handler_host_linux.h"
171 #endif 172 #endif
172 173
173 #if defined(OS_ANDROID) 174 #if defined(OS_ANDROID)
174 #include "ui/base/ui_base_paths.h" 175 #include "ui/base/ui_base_paths.h"
175 #include "ui/gfx/android/device_display_info.h" 176 #include "ui/gfx/android/device_display_info.h"
176 #endif 177 #endif
177 178
178 #if defined(OS_ANDROID)
179 #include "chrome/browser/android/dev_tools_manager_delegate_android.h"
180 #else
181 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
182 #endif
183
184 #if defined(TOOLKIT_VIEWS) 179 #if defined(TOOLKIT_VIEWS)
185 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 180 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
186 #endif 181 #endif
187 182
188 #if defined(USE_ASH) 183 #if defined(USE_ASH)
189 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 184 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
190 #endif 185 #endif
191 186
192 #if defined(USE_AURA) 187 #if defined(USE_AURA)
193 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" 188 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
(...skipping 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2360 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric, 2355 void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
2361 const GURL& url) { 2356 const GURL& url) {
2362 if (url.is_valid()) { 2357 if (url.is_valid()) {
2363 rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(), 2358 rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
2364 metric, url); 2359 metric, url);
2365 } 2360 }
2366 } 2361 }
2367 2362
2368 content::DevToolsManagerDelegate* 2363 content::DevToolsManagerDelegate*
2369 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2364 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2370 #if defined(OS_ANDROID)
2371 return new DevToolsManagerDelegateAndroid();
2372 #else
2373 return new ChromeDevToolsManagerDelegate(); 2365 return new ChromeDevToolsManagerDelegate();
2374 #endif
2375 } 2366 }
2376 2367
2377 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { 2368 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
2378 #if !defined(OS_ANDROID) 2369 #if !defined(OS_ANDROID)
2379 return new ChromeTracingDelegate(); 2370 return new ChromeTracingDelegate();
2380 #else 2371 #else
2381 return nullptr; 2372 return nullptr;
2382 #endif 2373 #endif
2383 } 2374 }
2384 2375
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
2442 switches::kDisableWebRtcEncryption, 2433 switches::kDisableWebRtcEncryption,
2443 }; 2434 };
2444 to_command_line->CopySwitchesFrom(from_command_line, 2435 to_command_line->CopySwitchesFrom(from_command_line,
2445 kWebRtcDevSwitchNames, 2436 kWebRtcDevSwitchNames,
2446 arraysize(kWebRtcDevSwitchNames)); 2437 arraysize(kWebRtcDevSwitchNames));
2447 } 2438 }
2448 } 2439 }
2449 #endif // defined(ENABLE_WEBRTC) 2440 #endif // defined(ENABLE_WEBRTC)
2450 2441
2451 } // namespace chrome 2442 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/dev_tools_server.cc ('k') | chrome/browser/devtools/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698