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

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: 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 133 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 2332 matching lines...) Expand 10 before | Expand all | Expand 10 after
2496 content::BrowserContext* browser_context, 2497 content::BrowserContext* browser_context,
2497 const GURL& security_origin, 2498 const GURL& security_origin,
2498 content::MediaStreamType type) { 2499 content::MediaStreamType type) {
2499 return MediaCaptureDevicesDispatcher::GetInstance() 2500 return MediaCaptureDevicesDispatcher::GetInstance()
2500 ->CheckMediaAccessPermission( 2501 ->CheckMediaAccessPermission(
2501 browser_context, security_origin, type); 2502 browser_context, security_origin, type);
2502 } 2503 }
2503 2504
2504 content::DevToolsManagerDelegate* 2505 content::DevToolsManagerDelegate*
2505 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2506 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2507 #if defined(OS_ANDROID)
2508 return new DevToolsManagerDelegateAndroid();
2509 #else
2506 return new ChromeDevToolsManagerDelegate(); 2510 return new ChromeDevToolsManagerDelegate();
2511 #endif
2507 } 2512 }
2508 2513
2509 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 2514 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
2510 content::BrowserContext* browser_context, 2515 content::BrowserContext* browser_context,
2511 const GURL& url) { 2516 const GURL& url) {
2512 #if defined(ENABLE_EXTENSIONS) 2517 #if defined(ENABLE_EXTENSIONS)
2513 Profile* profile = Profile::FromBrowserContext(browser_context); 2518 Profile* profile = Profile::FromBrowserContext(browser_context);
2514 const extensions::ExtensionSet* extension_set = NULL; 2519 const extensions::ExtensionSet* extension_set = NULL;
2515 if (profile) { 2520 if (profile) {
2516 const ExtensionService* ext_service = 2521 const ExtensionService* ext_service =
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
2592 switches::kDisableWebRtcEncryption, 2597 switches::kDisableWebRtcEncryption,
2593 }; 2598 };
2594 to_command_line->CopySwitchesFrom(from_command_line, 2599 to_command_line->CopySwitchesFrom(from_command_line,
2595 kWebRtcDevSwitchNames, 2600 kWebRtcDevSwitchNames,
2596 arraysize(kWebRtcDevSwitchNames)); 2601 arraysize(kWebRtcDevSwitchNames));
2597 } 2602 }
2598 } 2603 }
2599 #endif // defined(ENABLE_WEBRTC) 2604 #endif // defined(ENABLE_WEBRTC)
2600 2605
2601 } // namespace chrome 2606 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698