OLD | NEW |
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 2549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2560 | 2560 |
2561 bool ChromeContentBrowserClient::CheckMediaAccessPermission( | 2561 bool ChromeContentBrowserClient::CheckMediaAccessPermission( |
2562 content::BrowserContext* browser_context, | 2562 content::BrowserContext* browser_context, |
2563 const GURL& security_origin, | 2563 const GURL& security_origin, |
2564 content::MediaStreamType type) { | 2564 content::MediaStreamType type) { |
2565 return MediaCaptureDevicesDispatcher::GetInstance() | 2565 return MediaCaptureDevicesDispatcher::GetInstance() |
2566 ->CheckMediaAccessPermission( | 2566 ->CheckMediaAccessPermission( |
2567 browser_context, security_origin, type); | 2567 browser_context, security_origin, type); |
2568 } | 2568 } |
2569 | 2569 |
| 2570 content::WebContents* ChromeContentBrowserClient::OpenURL( |
| 2571 content::BrowserContext* browser_context, |
| 2572 const content::OpenURLParams& params) { |
| 2573 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 2574 |
| 2575 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2576 NavigateParams nav_params(Profile::FromBrowserContext(browser_context), |
| 2577 params.url, |
| 2578 params.transition); |
| 2579 FillNavigateParamsFromOpenURLParams(&nav_params, params); |
| 2580 nav_params.user_gesture = params.user_gesture; |
| 2581 |
| 2582 Navigate(&nav_params); |
| 2583 return nav_params.target_contents; |
| 2584 #else |
| 2585 // TODO(mlamouri): write a chrome::Navigate() method for Android and iOS. |
| 2586 // See https://crbug.com/448409. |
| 2587 return nullptr; |
| 2588 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2589 } |
| 2590 |
2570 content::DevToolsManagerDelegate* | 2591 content::DevToolsManagerDelegate* |
2571 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { | 2592 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { |
2572 #if defined(OS_ANDROID) | 2593 #if defined(OS_ANDROID) |
2573 return new DevToolsManagerDelegateAndroid(); | 2594 return new DevToolsManagerDelegateAndroid(); |
2574 #else | 2595 #else |
2575 return new ChromeDevToolsManagerDelegate(); | 2596 return new ChromeDevToolsManagerDelegate(); |
2576 #endif | 2597 #endif |
2577 } | 2598 } |
2578 | 2599 |
2579 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( | 2600 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2646 switches::kDisableWebRtcEncryption, | 2667 switches::kDisableWebRtcEncryption, |
2647 }; | 2668 }; |
2648 to_command_line->CopySwitchesFrom(from_command_line, | 2669 to_command_line->CopySwitchesFrom(from_command_line, |
2649 kWebRtcDevSwitchNames, | 2670 kWebRtcDevSwitchNames, |
2650 arraysize(kWebRtcDevSwitchNames)); | 2671 arraysize(kWebRtcDevSwitchNames)); |
2651 } | 2672 } |
2652 } | 2673 } |
2653 #endif // defined(ENABLE_WEBRTC) | 2674 #endif // defined(ENABLE_WEBRTC) |
2654 | 2675 |
2655 } // namespace chrome | 2676 } // namespace chrome |
OLD | NEW |