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

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: fixed compile 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" 35 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
vkuzkokov 2014/09/16 11:46:40 chrome_devtools_manager_delegate.h and .cc should
dgozman 2014/09/16 13:23:57 Done.
36 #include "chrome/browser/download/download_prefs.h" 36 #include "chrome/browser/download/download_prefs.h"
37 #include "chrome/browser/font_family_cache.h" 37 #include "chrome/browser/font_family_cache.h"
38 #include "chrome/browser/geolocation/chrome_access_token_store.h" 38 #include "chrome/browser/geolocation/chrome_access_token_store.h"
39 #include "chrome/browser/geolocation/geolocation_permission_context.h" 39 #include "chrome/browser/geolocation/geolocation_permission_context.h"
40 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" 40 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
41 #include "chrome/browser/media/cast_transport_host_filter.h" 41 #include "chrome/browser/media/cast_transport_host_filter.h"
42 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 42 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
43 #include "chrome/browser/media/midi_permission_context.h" 43 #include "chrome/browser/media/midi_permission_context.h"
44 #include "chrome/browser/media/midi_permission_context_factory.h" 44 #include "chrome/browser/media/midi_permission_context_factory.h"
45 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 45 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 144 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
145 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 145 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
146 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 146 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
147 #include "chrome/browser/chromeos/login/startup_utils.h" 147 #include "chrome/browser/chromeos/login/startup_utils.h"
148 #include "chrome/browser/chromeos/system/input_device_settings.h" 148 #include "chrome/browser/chromeos/system/input_device_settings.h"
149 #include "chromeos/chromeos_switches.h" 149 #include "chromeos/chromeos_switches.h"
150 #include "components/user_manager/user_manager.h" 150 #include "components/user_manager/user_manager.h"
151 #elif defined(OS_LINUX) 151 #elif defined(OS_LINUX)
152 #include "chrome/browser/chrome_browser_main_linux.h" 152 #include "chrome/browser/chrome_browser_main_linux.h"
153 #elif defined(OS_ANDROID) 153 #elif defined(OS_ANDROID)
154 #include "chrome/browser/android/dev_tools_manager_delegate_android.h"
154 #include "chrome/browser/android/new_tab_page_url_handler.h" 155 #include "chrome/browser/android/new_tab_page_url_handler.h"
155 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 156 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
156 #include "chrome/browser/chrome_browser_main_android.h" 157 #include "chrome/browser/chrome_browser_main_android.h"
157 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 158 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
158 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 159 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
159 #include "chrome/common/descriptors_android.h" 160 #include "chrome/common/descriptors_android.h"
160 #include "components/crash/browser/crash_dump_manager_android.h" 161 #include "components/crash/browser/crash_dump_manager_android.h"
161 #elif defined(OS_POSIX) 162 #elif defined(OS_POSIX)
162 #include "chrome/browser/chrome_browser_main_posix.h" 163 #include "chrome/browser/chrome_browser_main_posix.h"
163 #endif 164 #endif
(...skipping 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after
2495 content::BrowserContext* browser_context, 2496 content::BrowserContext* browser_context,
2496 const GURL& security_origin, 2497 const GURL& security_origin,
2497 content::MediaStreamType type) { 2498 content::MediaStreamType type) {
2498 return MediaCaptureDevicesDispatcher::GetInstance() 2499 return MediaCaptureDevicesDispatcher::GetInstance()
2499 ->CheckMediaAccessPermission( 2500 ->CheckMediaAccessPermission(
2500 browser_context, security_origin, type); 2501 browser_context, security_origin, type);
2501 } 2502 }
2502 2503
2503 content::DevToolsManagerDelegate* 2504 content::DevToolsManagerDelegate*
2504 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2505 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2506 #if defined(OS_ANDROID)
2507 return new DevToolsManagerDelegateAndroid();
2508 #else
2505 return new ChromeDevToolsManagerDelegate(); 2509 return new ChromeDevToolsManagerDelegate();
2510 #endif
2506 } 2511 }
2507 2512
2508 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 2513 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
2509 content::BrowserContext* browser_context, 2514 content::BrowserContext* browser_context,
2510 const GURL& url) { 2515 const GURL& url) {
2511 #if defined(ENABLE_EXTENSIONS) 2516 #if defined(ENABLE_EXTENSIONS)
2512 Profile* profile = Profile::FromBrowserContext(browser_context); 2517 Profile* profile = Profile::FromBrowserContext(browser_context);
2513 const extensions::ExtensionSet* extension_set = NULL; 2518 const extensions::ExtensionSet* extension_set = NULL;
2514 if (profile) { 2519 if (profile) {
2515 const ExtensionService* ext_service = 2520 const ExtensionService* ext_service =
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
2591 switches::kDisableWebRtcEncryption, 2596 switches::kDisableWebRtcEncryption,
2592 }; 2597 };
2593 to_command_line->CopySwitchesFrom(from_command_line, 2598 to_command_line->CopySwitchesFrom(from_command_line,
2594 kWebRtcDevSwitchNames, 2599 kWebRtcDevSwitchNames,
2595 arraysize(kWebRtcDevSwitchNames)); 2600 arraysize(kWebRtcDevSwitchNames));
2596 } 2601 }
2597 } 2602 }
2598 #endif // defined(ENABLE_WEBRTC) 2603 #endif // defined(ENABLE_WEBRTC)
2599 2604
2600 } // namespace chrome 2605 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698