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