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

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

Issue 897673002: First step in enabling creating tabs without an Activity on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a-base-mounir
Patch Set: rebase Created 5 years, 10 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 149 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
150 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 150 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
151 #include "chrome/browser/chromeos/login/startup_utils.h" 151 #include "chrome/browser/chromeos/login/startup_utils.h"
152 #include "chrome/browser/chromeos/system/input_device_settings.h" 152 #include "chrome/browser/chromeos/system/input_device_settings.h"
153 #include "chromeos/chromeos_switches.h" 153 #include "chromeos/chromeos_switches.h"
154 #include "components/user_manager/user_manager.h" 154 #include "components/user_manager/user_manager.h"
155 #elif defined(OS_LINUX) 155 #elif defined(OS_LINUX)
156 #include "chrome/browser/chrome_browser_main_linux.h" 156 #include "chrome/browser/chrome_browser_main_linux.h"
157 #elif defined(OS_ANDROID) 157 #elif defined(OS_ANDROID)
158 #include "chrome/browser/android/new_tab_page_url_handler.h" 158 #include "chrome/browser/android/new_tab_page_url_handler.h"
159 #include "chrome/browser/android/service_tab_launcher.h"
159 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 160 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
160 #include "chrome/browser/chrome_browser_main_android.h" 161 #include "chrome/browser/chrome_browser_main_android.h"
161 #include "chrome/common/descriptors_android.h" 162 #include "chrome/common/descriptors_android.h"
162 #include "components/crash/browser/crash_dump_manager_android.h" 163 #include "components/crash/browser/crash_dump_manager_android.h"
163 #elif defined(OS_POSIX) 164 #elif defined(OS_POSIX)
164 #include "chrome/browser/chrome_browser_main_posix.h" 165 #include "chrome/browser/chrome_browser_main_posix.h"
165 #endif 166 #endif
166 167
167 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 168 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
168 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 169 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
(...skipping 2346 matching lines...) Expand 10 before | Expand all | Expand 10 after
2515 2516
2516 bool ChromeContentBrowserClient::CheckMediaAccessPermission( 2517 bool ChromeContentBrowserClient::CheckMediaAccessPermission(
2517 content::BrowserContext* browser_context, 2518 content::BrowserContext* browser_context,
2518 const GURL& security_origin, 2519 const GURL& security_origin,
2519 content::MediaStreamType type) { 2520 content::MediaStreamType type) {
2520 return MediaCaptureDevicesDispatcher::GetInstance() 2521 return MediaCaptureDevicesDispatcher::GetInstance()
2521 ->CheckMediaAccessPermission( 2522 ->CheckMediaAccessPermission(
2522 browser_context, security_origin, type); 2523 browser_context, security_origin, type);
2523 } 2524 }
2524 2525
2525 content::WebContents* ChromeContentBrowserClient::OpenURL( 2526 void ChromeContentBrowserClient::OpenURL(
2526 content::BrowserContext* browser_context, 2527 content::BrowserContext* browser_context,
2527 const content::OpenURLParams& params) { 2528 const content::OpenURLParams& params,
2529 const base::Callback<void(content::WebContents*)>& callback) {
2528 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2530 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2529 2531
2530 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2532 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2531 NavigateParams nav_params(Profile::FromBrowserContext(browser_context), 2533 NavigateParams nav_params(Profile::FromBrowserContext(browser_context),
2532 params.url, 2534 params.url,
2533 params.transition); 2535 params.transition);
2534 FillNavigateParamsFromOpenURLParams(&nav_params, params); 2536 FillNavigateParamsFromOpenURLParams(&nav_params, params);
2535 nav_params.user_gesture = params.user_gesture; 2537 nav_params.user_gesture = params.user_gesture;
2536 2538
2537 Navigate(&nav_params); 2539 Navigate(&nav_params);
2538 return nav_params.target_contents; 2540 callback.Run(nav_params.target_contents);
2541 #elif defined(OS_ANDROID)
2542 chrome::android::ServiceTabLauncher::GetInstance()->LaunchTab(
2543 browser_context, params, callback);
2539 #else 2544 #else
2540 // TODO(mlamouri): write a chrome::Navigate() method for Android and iOS. 2545 NOTIMPLEMENTED();
2541 // See https://crbug.com/448409. 2546 #endif
2542 return nullptr;
2543 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
2544 } 2547 }
2545 2548
2546 content::DevToolsManagerDelegate* 2549 content::DevToolsManagerDelegate*
2547 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2550 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2548 #if defined(OS_ANDROID) 2551 #if defined(OS_ANDROID)
2549 return new DevToolsManagerDelegateAndroid(); 2552 return new DevToolsManagerDelegateAndroid();
2550 #else 2553 #else
2551 return new ChromeDevToolsManagerDelegate(); 2554 return new ChromeDevToolsManagerDelegate();
2552 #endif 2555 #endif
2553 } 2556 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 switches::kDisableWebRtcEncryption, 2625 switches::kDisableWebRtcEncryption,
2623 }; 2626 };
2624 to_command_line->CopySwitchesFrom(from_command_line, 2627 to_command_line->CopySwitchesFrom(from_command_line,
2625 kWebRtcDevSwitchNames, 2628 kWebRtcDevSwitchNames,
2626 arraysize(kWebRtcDevSwitchNames)); 2629 arraysize(kWebRtcDevSwitchNames));
2627 } 2630 }
2628 } 2631 }
2629 #endif // defined(ENABLE_WEBRTC) 2632 #endif // defined(ENABLE_WEBRTC)
2630 2633
2631 } // namespace chrome 2634 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698