| 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 2782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2793 | 2793 |
| 2794 #if BUILDFLAG(ANDROID_JAVA_UI) | 2794 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 2795 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( | 2795 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( |
| 2796 registry, render_frame_host); | 2796 registry, render_frame_host); |
| 2797 #endif | 2797 #endif |
| 2798 } | 2798 } |
| 2799 | 2799 |
| 2800 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 2800 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
| 2801 StaticMojoApplicationMap* apps) { | 2801 StaticMojoApplicationMap* apps) { |
| 2802 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 2802 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 2803 apps->insert(std::make_pair("mojo:media", | 2803 content::MojoApplicationInfo app_info; |
| 2804 base::Bind(&media::CreateMojoMediaApplication))); | 2804 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); |
| 2805 apps->insert(std::make_pair("mojo:media", app_info)); |
| 2805 #endif | 2806 #endif |
| 2806 } | 2807 } |
| 2807 | 2808 |
| 2808 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( | 2809 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( |
| 2809 OutOfProcessMojoApplicationMap* apps) { | 2810 OutOfProcessMojoApplicationMap* apps) { |
| 2810 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 2811 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
| 2811 apps->insert(std::make_pair("mojo:media", | 2812 apps->insert(std::make_pair("mojo:media", |
| 2812 base::ASCIIToUTF16("Media App"))); | 2813 base::ASCIIToUTF16("Media App"))); |
| 2813 #endif | 2814 #endif |
| 2814 } | 2815 } |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2968 if (channel <= kMaxDisableEncryptionChannel) { | 2969 if (channel <= kMaxDisableEncryptionChannel) { |
| 2969 static const char* const kWebRtcDevSwitchNames[] = { | 2970 static const char* const kWebRtcDevSwitchNames[] = { |
| 2970 switches::kDisableWebRtcEncryption, | 2971 switches::kDisableWebRtcEncryption, |
| 2971 }; | 2972 }; |
| 2972 to_command_line->CopySwitchesFrom(from_command_line, | 2973 to_command_line->CopySwitchesFrom(from_command_line, |
| 2973 kWebRtcDevSwitchNames, | 2974 kWebRtcDevSwitchNames, |
| 2974 arraysize(kWebRtcDevSwitchNames)); | 2975 arraysize(kWebRtcDevSwitchNames)); |
| 2975 } | 2976 } |
| 2976 } | 2977 } |
| 2977 #endif // defined(ENABLE_WEBRTC) | 2978 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |