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 2567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2578 | 2578 |
2579 bool ChromeContentBrowserClient::CheckMediaAccessPermission( | 2579 bool ChromeContentBrowserClient::CheckMediaAccessPermission( |
2580 content::BrowserContext* browser_context, | 2580 content::BrowserContext* browser_context, |
2581 const GURL& security_origin, | 2581 const GURL& security_origin, |
2582 content::MediaStreamType type) { | 2582 content::MediaStreamType type) { |
2583 return MediaCaptureDevicesDispatcher::GetInstance() | 2583 return MediaCaptureDevicesDispatcher::GetInstance() |
2584 ->CheckMediaAccessPermission( | 2584 ->CheckMediaAccessPermission( |
2585 browser_context, security_origin, type); | 2585 browser_context, security_origin, type); |
2586 } | 2586 } |
2587 | 2587 |
| 2588 content::WebContents* ChromeContentBrowserClient::OpenURL( |
| 2589 content::BrowserContext* browser_context, |
| 2590 const content::OpenURLParams& params) { |
| 2591 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 2592 |
| 2593 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2594 NavigateParams nav_params(Profile::FromBrowserContext(browser_context), |
| 2595 params.url, |
| 2596 params.transition); |
| 2597 FillNavigateParamsFromOpenURLParams(&nav_params, params); |
| 2598 nav_params.user_gesture = params.user_gesture; |
| 2599 |
| 2600 Navigate(&nav_params); |
| 2601 return nav_params.target_contents; |
| 2602 #else |
| 2603 // TODO(mlamouri): write a chrome::Navigate() method for Android and iOS. |
| 2604 // See https://crbug.com/448409. |
| 2605 return nullptr; |
| 2606 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2607 } |
| 2608 |
2588 content::DevToolsManagerDelegate* | 2609 content::DevToolsManagerDelegate* |
2589 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { | 2610 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { |
2590 #if defined(OS_ANDROID) | 2611 #if defined(OS_ANDROID) |
2591 return new DevToolsManagerDelegateAndroid(); | 2612 return new DevToolsManagerDelegateAndroid(); |
2592 #else | 2613 #else |
2593 return new ChromeDevToolsManagerDelegate(); | 2614 return new ChromeDevToolsManagerDelegate(); |
2594 #endif | 2615 #endif |
2595 } | 2616 } |
2596 | 2617 |
2597 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( | 2618 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2664 switches::kDisableWebRtcEncryption, | 2685 switches::kDisableWebRtcEncryption, |
2665 }; | 2686 }; |
2666 to_command_line->CopySwitchesFrom(from_command_line, | 2687 to_command_line->CopySwitchesFrom(from_command_line, |
2667 kWebRtcDevSwitchNames, | 2688 kWebRtcDevSwitchNames, |
2668 arraysize(kWebRtcDevSwitchNames)); | 2689 arraysize(kWebRtcDevSwitchNames)); |
2669 } | 2690 } |
2670 } | 2691 } |
2671 #endif // defined(ENABLE_WEBRTC) | 2692 #endif // defined(ENABLE_WEBRTC) |
2672 | 2693 |
2673 } // namespace chrome | 2694 } // namespace chrome |
OLD | NEW |