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

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

Issue 560323005: [DevTools] Move target-related methods from DevToolsHttpHandlerDelegate to DevToolsManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/character_encoding.h" 25 #include "chrome/browser/character_encoding.h"
26 #include "chrome/browser/chrome_content_browser_client_parts.h" 26 #include "chrome/browser/chrome_content_browser_client_parts.h"
27 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 27 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
28 #include "chrome/browser/chrome_quota_permission_context.h" 28 #include "chrome/browser/chrome_quota_permission_context.h"
29 #include "chrome/browser/content_settings/content_settings_utils.h" 29 #include "chrome/browser/content_settings/content_settings_utils.h"
30 #include "chrome/browser/content_settings/cookie_settings.h" 30 #include "chrome/browser/content_settings/cookie_settings.h"
31 #include "chrome/browser/content_settings/host_content_settings_map.h" 31 #include "chrome/browser/content_settings/host_content_settings_map.h"
32 #include "chrome/browser/content_settings/permission_request_id.h" 32 #include "chrome/browser/content_settings/permission_request_id.h"
33 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 33 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
34 #include "chrome/browser/defaults.h" 34 #include "chrome/browser/defaults.h"
35 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
36 #include "chrome/browser/download/download_prefs.h" 35 #include "chrome/browser/download/download_prefs.h"
37 #include "chrome/browser/font_family_cache.h" 36 #include "chrome/browser/font_family_cache.h"
38 #include "chrome/browser/geolocation/chrome_access_token_store.h" 37 #include "chrome/browser/geolocation/chrome_access_token_store.h"
39 #include "chrome/browser/geolocation/geolocation_permission_context.h" 38 #include "chrome/browser/geolocation/geolocation_permission_context.h"
40 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" 39 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
41 #include "chrome/browser/media/cast_transport_host_filter.h" 40 #include "chrome/browser/media/cast_transport_host_filter.h"
42 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 41 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
43 #include "chrome/browser/media/midi_permission_context.h" 42 #include "chrome/browser/media/midi_permission_context.h"
44 #include "chrome/browser/media/midi_permission_context_factory.h" 43 #include "chrome/browser/media/midi_permission_context_factory.h"
45 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 44 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #include "base/debug/leak_annotations.h" 165 #include "base/debug/leak_annotations.h"
167 #include "components/crash/app/breakpad_linux.h" 166 #include "components/crash/app/breakpad_linux.h"
168 #include "components/crash/browser/crash_handler_host_linux.h" 167 #include "components/crash/browser/crash_handler_host_linux.h"
169 #endif 168 #endif
170 169
171 #if defined(OS_ANDROID) 170 #if defined(OS_ANDROID)
172 #include "ui/base/ui_base_paths.h" 171 #include "ui/base/ui_base_paths.h"
173 #include "ui/gfx/android/device_display_info.h" 172 #include "ui/gfx/android/device_display_info.h"
174 #endif 173 #endif
175 174
175 #if defined(OS_ANDROID)
176 #include "chrome/browser/android/dev_tools_manager_delegate_android.h"
177 #else
178 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
179 #endif
180
176 #if !defined(OS_CHROMEOS) 181 #if !defined(OS_CHROMEOS)
177 #include "chrome/browser/signin/chrome_signin_client.h" 182 #include "chrome/browser/signin/chrome_signin_client.h"
178 #include "chrome/browser/signin/chrome_signin_client_factory.h" 183 #include "chrome/browser/signin/chrome_signin_client_factory.h"
179 #include "chrome/browser/signin/signin_manager_factory.h" 184 #include "chrome/browser/signin/signin_manager_factory.h"
180 #include "components/signin/core/browser/signin_manager.h" 185 #include "components/signin/core/browser/signin_manager.h"
181 #endif 186 #endif
182 187
183 #if defined(TOOLKIT_VIEWS) 188 #if defined(TOOLKIT_VIEWS)
184 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 189 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
185 #endif 190 #endif
(...skipping 2309 matching lines...) Expand 10 before | Expand all | Expand 10 after
2495 content::BrowserContext* browser_context, 2500 content::BrowserContext* browser_context,
2496 const GURL& security_origin, 2501 const GURL& security_origin,
2497 content::MediaStreamType type) { 2502 content::MediaStreamType type) {
2498 return MediaCaptureDevicesDispatcher::GetInstance() 2503 return MediaCaptureDevicesDispatcher::GetInstance()
2499 ->CheckMediaAccessPermission( 2504 ->CheckMediaAccessPermission(
2500 browser_context, security_origin, type); 2505 browser_context, security_origin, type);
2501 } 2506 }
2502 2507
2503 content::DevToolsManagerDelegate* 2508 content::DevToolsManagerDelegate*
2504 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2509 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2510 #if defined(OS_ANDROID)
2511 return new DevToolsManagerDelegateAndroid();
pfeldman 2014/09/18 11:45:58 nit: ChromeDevToolsManager vs DevToolsManagerDeleg
2512 #else
2505 return new ChromeDevToolsManagerDelegate(); 2513 return new ChromeDevToolsManagerDelegate();
2514 #endif
2506 } 2515 }
2507 2516
2508 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 2517 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
2509 content::BrowserContext* browser_context, 2518 content::BrowserContext* browser_context,
2510 const GURL& url) { 2519 const GURL& url) {
2511 #if defined(ENABLE_EXTENSIONS) 2520 #if defined(ENABLE_EXTENSIONS)
2512 Profile* profile = Profile::FromBrowserContext(browser_context); 2521 Profile* profile = Profile::FromBrowserContext(browser_context);
2513 const extensions::ExtensionSet* extension_set = NULL; 2522 const extensions::ExtensionSet* extension_set = NULL;
2514 if (profile) { 2523 if (profile) {
2515 const ExtensionService* ext_service = 2524 const ExtensionService* ext_service =
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
2591 switches::kDisableWebRtcEncryption, 2600 switches::kDisableWebRtcEncryption,
2592 }; 2601 };
2593 to_command_line->CopySwitchesFrom(from_command_line, 2602 to_command_line->CopySwitchesFrom(from_command_line,
2594 kWebRtcDevSwitchNames, 2603 kWebRtcDevSwitchNames,
2595 arraysize(kWebRtcDevSwitchNames)); 2604 arraysize(kWebRtcDevSwitchNames));
2596 } 2605 }
2597 } 2606 }
2598 #endif // defined(ENABLE_WEBRTC) 2607 #endif // defined(ENABLE_WEBRTC)
2599 2608
2600 } // namespace chrome 2609 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698