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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2581 render_frame_host)); | 2581 render_frame_host)); |
2582 #endif | 2582 #endif |
2583 } | 2583 } |
2584 | 2584 |
2585 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( | 2585 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( |
2586 content::ServiceRegistry* registry, | 2586 content::ServiceRegistry* registry, |
2587 content::RenderFrameHost* render_frame_host) { | 2587 content::RenderFrameHost* render_frame_host) { |
2588 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); | 2588 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); |
2589 } | 2589 } |
2590 | 2590 |
| 2591 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( |
| 2592 OutOfProcessMojoApplicationMap* apps) { |
| 2593 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
| 2594 apps->insert(std::make_pair(GURL("mojo:media"), |
| 2595 base::ASCIIToUTF16("Media App"))); |
| 2596 #endif |
| 2597 } |
| 2598 |
2591 void ChromeContentBrowserClient::OpenURL( | 2599 void ChromeContentBrowserClient::OpenURL( |
2592 content::BrowserContext* browser_context, | 2600 content::BrowserContext* browser_context, |
2593 const content::OpenURLParams& params, | 2601 const content::OpenURLParams& params, |
2594 const base::Callback<void(content::WebContents*)>& callback) { | 2602 const base::Callback<void(content::WebContents*)>& callback) { |
2595 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 2603 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
2596 | 2604 |
2597 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 2605 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
2598 chrome::NavigateParams nav_params( | 2606 chrome::NavigateParams nav_params( |
2599 Profile::FromBrowserContext(browser_context), | 2607 Profile::FromBrowserContext(browser_context), |
2600 params.url, | 2608 params.url, |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2747 if (channel <= kMaxDisableEncryptionChannel) { | 2755 if (channel <= kMaxDisableEncryptionChannel) { |
2748 static const char* const kWebRtcDevSwitchNames[] = { | 2756 static const char* const kWebRtcDevSwitchNames[] = { |
2749 switches::kDisableWebRtcEncryption, | 2757 switches::kDisableWebRtcEncryption, |
2750 }; | 2758 }; |
2751 to_command_line->CopySwitchesFrom(from_command_line, | 2759 to_command_line->CopySwitchesFrom(from_command_line, |
2752 kWebRtcDevSwitchNames, | 2760 kWebRtcDevSwitchNames, |
2753 arraysize(kWebRtcDevSwitchNames)); | 2761 arraysize(kWebRtcDevSwitchNames)); |
2754 } | 2762 } |
2755 } | 2763 } |
2756 #endif // defined(ENABLE_WEBRTC) | 2764 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |