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 2767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2778 } | 2778 } |
2779 | 2779 |
2780 // Register mojo CredentialManager service only for main frame. | 2780 // Register mojo CredentialManager service only for main frame. |
2781 if (!render_frame_host->GetParent()) { | 2781 if (!render_frame_host->GetParent()) { |
2782 registry->AddService( | 2782 registry->AddService( |
2783 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, | 2783 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, |
2784 render_frame_host)); | 2784 render_frame_host)); |
2785 } | 2785 } |
2786 | 2786 |
2787 #if BUILDFLAG(ANDROID_JAVA_UI) | 2787 #if BUILDFLAG(ANDROID_JAVA_UI) |
2788 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(registry); | 2788 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices( |
| 2789 registry, render_frame_host); |
2789 #endif | 2790 #endif |
2790 } | 2791 } |
2791 | 2792 |
2792 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 2793 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
2793 StaticMojoApplicationMap* apps) { | 2794 StaticMojoApplicationMap* apps) { |
2794 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 2795 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
2795 apps->insert(std::make_pair("mojo:media", | 2796 apps->insert(std::make_pair("mojo:media", |
2796 base::Bind(&media::CreateMojoMediaApplication))); | 2797 base::Bind(&media::CreateMojoMediaApplication))); |
2797 #endif | 2798 #endif |
2798 } | 2799 } |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2960 if (channel <= kMaxDisableEncryptionChannel) { | 2961 if (channel <= kMaxDisableEncryptionChannel) { |
2961 static const char* const kWebRtcDevSwitchNames[] = { | 2962 static const char* const kWebRtcDevSwitchNames[] = { |
2962 switches::kDisableWebRtcEncryption, | 2963 switches::kDisableWebRtcEncryption, |
2963 }; | 2964 }; |
2964 to_command_line->CopySwitchesFrom(from_command_line, | 2965 to_command_line->CopySwitchesFrom(from_command_line, |
2965 kWebRtcDevSwitchNames, | 2966 kWebRtcDevSwitchNames, |
2966 arraysize(kWebRtcDevSwitchNames)); | 2967 arraysize(kWebRtcDevSwitchNames)); |
2967 } | 2968 } |
2968 } | 2969 } |
2969 #endif // defined(ENABLE_WEBRTC) | 2970 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |