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

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

Issue 2066483004: [Wait to be closed] [Translate] Migrate IPCs to Mojo interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from groby, Anand Created 4 years, 5 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/translate/chrome_translate_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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "chrome/browser/speech/tts_controller.h" 77 #include "chrome/browser/speech/tts_controller.h"
78 #include "chrome/browser/speech/tts_message_filter.h" 78 #include "chrome/browser/speech/tts_message_filter.h"
79 #include "chrome/browser/ssl/ssl_add_certificate.h" 79 #include "chrome/browser/ssl/ssl_add_certificate.h"
80 #include "chrome/browser/ssl/ssl_blocking_page.h" 80 #include "chrome/browser/ssl/ssl_blocking_page.h"
81 #include "chrome/browser/ssl/ssl_cert_reporter.h" 81 #include "chrome/browser/ssl/ssl_cert_reporter.h"
82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
83 #include "chrome/browser/ssl/ssl_error_handler.h" 83 #include "chrome/browser/ssl/ssl_error_handler.h"
84 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" 84 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
85 #include "chrome/browser/tab_contents/tab_util.h" 85 #include "chrome/browser/tab_contents/tab_util.h"
86 #include "chrome/browser/tracing/chrome_tracing_delegate.h" 86 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
87 #include "chrome/browser/translate/chrome_translate_client.h"
87 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" 88 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
88 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" 89 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
89 #include "chrome/browser/ui/browser_navigator.h" 90 #include "chrome/browser/ui/browser_navigator.h"
90 #include "chrome/browser/ui/browser_navigator_params.h" 91 #include "chrome/browser/ui/browser_navigator_params.h"
91 #include "chrome/browser/ui/chrome_select_file_policy.h" 92 #include "chrome/browser/ui/chrome_select_file_policy.h"
92 #include "chrome/browser/ui/sync/sync_promo_ui.h" 93 #include "chrome/browser/ui/sync/sync_promo_ui.h"
93 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 94 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
94 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 95 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
95 #include "chrome/browser/ui/webui/log_web_ui_url.h" 96 #include "chrome/browser/ui/webui/log_web_ui_url.h"
96 #include "chrome/browser/usb/usb_tab_helper.h" 97 #include "chrome/browser/usb/usb_tab_helper.h"
(...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2826 if (!render_frame_host->GetParent()) { 2827 if (!render_frame_host->GetParent()) {
2827 registry->AddInterface( 2828 registry->AddInterface(
2828 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, 2829 base::Bind(&ChromePasswordManagerClient::BindCredentialManager,
2829 render_frame_host)); 2830 render_frame_host));
2830 } 2831 }
2831 2832
2832 registry->AddInterface( 2833 registry->AddInterface(
2833 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, 2834 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
2834 render_frame_host)); 2835 render_frame_host));
2835 2836
2837 // Register mojo ContentTranslateDriver service only for main frame.
2838 if (!render_frame_host->GetParent()) {
2839 registry->AddInterface(base::Bind(
2840 &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host));
2841 }
2842
2836 #if BUILDFLAG(ANDROID_JAVA_UI) 2843 #if BUILDFLAG(ANDROID_JAVA_UI)
2837 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoInterfaces( 2844 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoInterfaces(
2838 registry, render_frame_host); 2845 registry, render_frame_host);
2839 #endif 2846 #endif
2840 } 2847 }
2841 2848
2842 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2849 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2843 StaticMojoApplicationMap* apps) { 2850 StaticMojoApplicationMap* apps) {
2844 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2851 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
2845 content::MojoApplicationInfo app_info; 2852 content::MojoApplicationInfo app_info;
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
3043 if (channel <= kMaxDisableEncryptionChannel) { 3050 if (channel <= kMaxDisableEncryptionChannel) {
3044 static const char* const kWebRtcDevSwitchNames[] = { 3051 static const char* const kWebRtcDevSwitchNames[] = {
3045 switches::kDisableWebRtcEncryption, 3052 switches::kDisableWebRtcEncryption,
3046 }; 3053 };
3047 to_command_line->CopySwitchesFrom(from_command_line, 3054 to_command_line->CopySwitchesFrom(from_command_line,
3048 kWebRtcDevSwitchNames, 3055 kWebRtcDevSwitchNames,
3049 arraysize(kWebRtcDevSwitchNames)); 3056 arraysize(kWebRtcDevSwitchNames));
3050 } 3057 }
3051 } 3058 }
3052 #endif // defined(ENABLE_WEBRTC) 3059 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/translate/chrome_translate_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698