Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1872133002: Revert of Reland: Switch components/password_manager code from IPC messages to Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/password_manager/chrome_password_manager_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/download/download_prefs.h" 46 #include "chrome/browser/download/download_prefs.h"
47 #include "chrome/browser/engagement/site_engagement_eviction_policy.h" 47 #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
48 #include "chrome/browser/font_family_cache.h" 48 #include "chrome/browser/font_family_cache.h"
49 #include "chrome/browser/geolocation/chrome_access_token_store.h" 49 #include "chrome/browser/geolocation/chrome_access_token_store.h"
50 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 50 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
51 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" 51 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
52 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" 52 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
53 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 53 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
54 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" 54 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
55 #include "chrome/browser/notifications/platform_notification_service_impl.h" 55 #include "chrome/browser/notifications/platform_notification_service_impl.h"
56 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
57 #include "chrome/browser/permissions/permission_context_base.h" 56 #include "chrome/browser/permissions/permission_context_base.h"
58 #include "chrome/browser/platform_util.h" 57 #include "chrome/browser/platform_util.h"
59 #include "chrome/browser/prerender/prerender_final_status.h" 58 #include "chrome/browser/prerender/prerender_final_status.h"
60 #include "chrome/browser/prerender/prerender_manager.h" 59 #include "chrome/browser/prerender/prerender_manager.h"
61 #include "chrome/browser/prerender/prerender_manager_factory.h" 60 #include "chrome/browser/prerender/prerender_manager_factory.h"
62 #include "chrome/browser/prerender/prerender_message_filter.h" 61 #include "chrome/browser/prerender/prerender_message_filter.h"
63 #include "chrome/browser/printing/printing_message_filter.h" 62 #include "chrome/browser/printing/printing_message_filter.h"
64 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 63 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
65 #include "chrome/browser/profiles/profile.h" 64 #include "chrome/browser/profiles/profile.h"
66 #include "chrome/browser/profiles/profile_io_data.h" 65 #include "chrome/browser/profiles/profile_io_data.h"
(...skipping 2695 matching lines...) Expand 10 before | Expand all | Expand 10 after
2762 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( 2761 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
2763 content::ServiceRegistry* registry, 2762 content::ServiceRegistry* registry,
2764 content::RenderFrameHost* render_frame_host) { 2763 content::RenderFrameHost* render_frame_host) {
2765 if (base::FeatureList::IsEnabled(features::kWebUsb)) { 2764 if (base::FeatureList::IsEnabled(features::kWebUsb)) {
2766 registry->AddService( 2765 registry->AddService(
2767 base::Bind(&CreateUsbDeviceManager, render_frame_host)); 2766 base::Bind(&CreateUsbDeviceManager, render_frame_host));
2768 registry->AddService( 2767 registry->AddService(
2769 base::Bind(&CreateWebUsbChooserService, render_frame_host)); 2768 base::Bind(&CreateWebUsbChooserService, render_frame_host));
2770 } 2769 }
2771 2770
2772 // Register mojo CredentialManager service only for main frame.
2773 if (!render_frame_host->GetParent()) {
2774 registry->AddService(
2775 base::Bind(&ChromePasswordManagerClient::BindCredentialManager,
2776 render_frame_host));
2777 }
2778
2779 #if BUILDFLAG(ANDROID_JAVA_UI) 2771 #if BUILDFLAG(ANDROID_JAVA_UI)
2780 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(registry); 2772 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(registry);
2781 #endif 2773 #endif
2782 } 2774 }
2783 2775
2784 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2776 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2785 StaticMojoApplicationMap* apps) { 2777 StaticMojoApplicationMap* apps) {
2786 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2778 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
2787 apps->insert(std::make_pair("mojo:media", 2779 apps->insert(std::make_pair("mojo:media",
2788 base::Bind(&media::CreateMojoMediaApplication))); 2780 base::Bind(&media::CreateMojoMediaApplication)));
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2952 if (channel <= kMaxDisableEncryptionChannel) { 2944 if (channel <= kMaxDisableEncryptionChannel) {
2953 static const char* const kWebRtcDevSwitchNames[] = { 2945 static const char* const kWebRtcDevSwitchNames[] = {
2954 switches::kDisableWebRtcEncryption, 2946 switches::kDisableWebRtcEncryption,
2955 }; 2947 };
2956 to_command_line->CopySwitchesFrom(from_command_line, 2948 to_command_line->CopySwitchesFrom(from_command_line,
2957 kWebRtcDevSwitchNames, 2949 kWebRtcDevSwitchNames,
2958 arraysize(kWebRtcDevSwitchNames)); 2950 arraysize(kWebRtcDevSwitchNames));
2959 } 2951 }
2960 } 2952 }
2961 #endif // defined(ENABLE_WEBRTC) 2953 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/password_manager/chrome_password_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698