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

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

Issue 1831173002: Scaffolding for Android implementation of PaymentRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo
Patch Set: Register PaymentRequest with render process 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
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 #include "chrome/browser/chrome_browser_main_posix.h" 207 #include "chrome/browser/chrome_browser_main_posix.h"
208 #endif 208 #endif
209 209
210 #if defined(OS_POSIX) && !defined(OS_MACOSX) 210 #if defined(OS_POSIX) && !defined(OS_MACOSX)
211 #include "base/debug/leak_annotations.h" 211 #include "base/debug/leak_annotations.h"
212 #include "components/crash/content/app/breakpad_linux.h" 212 #include "components/crash/content/app/breakpad_linux.h"
213 #include "components/crash/content/browser/crash_handler_host_linux.h" 213 #include "components/crash/content/browser/crash_handler_host_linux.h"
214 #endif 214 #endif
215 215
216 #if BUILDFLAG(ANDROID_JAVA_UI) 216 #if BUILDFLAG(ANDROID_JAVA_UI)
217 #include "chrome/browser/android/mojo/chrome_service_registrar_android.h"
217 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h" 218 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
218 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" 219 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
219 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h " 220 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h "
220 #endif 221 #endif
221 222
222 #if defined(OS_ANDROID) 223 #if defined(OS_ANDROID)
223 #include "ui/base/ui_base_paths.h" 224 #include "ui/base/ui_base_paths.h"
224 #include "ui/gfx/android/device_display_info.h" 225 #include "ui/gfx/android/device_display_info.h"
225 #endif 226 #endif
226 227
(...skipping 2519 matching lines...) Expand 10 before | Expand all | Expand 10 after
2746 } 2747 }
2747 2748
2748 return false; 2749 return false;
2749 } 2750 }
2750 2751
2751 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { 2752 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const {
2752 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument; 2753 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument;
2753 } 2754 }
2754 #endif // defined(OS_WIN) 2755 #endif // defined(OS_WIN)
2755 2756
2757 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices(
2758 content::ServiceRegistry* registry) {
2759 #if BUILDFLAG(ANDROID_JAVA_UI)
2760 ChromeServiceRegistrarAndroid::RegisterServices(registry);
2761 #endif
2762 }
2763
2756 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( 2764 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
2757 content::ServiceRegistry* registry, 2765 content::ServiceRegistry* registry,
2758 content::RenderFrameHost* render_frame_host) { 2766 content::RenderFrameHost* render_frame_host) {
2759 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. 2767 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
2760 #if defined(OS_CHROMEOS) 2768 #if defined(OS_CHROMEOS)
2761 registry->AddService( 2769 registry->AddService(
2762 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2770 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2763 render_frame_host)); 2771 render_frame_host));
2764 #endif // defined(OS_CHROMEOS) 2772 #endif // defined(OS_CHROMEOS)
2765 2773
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
2955 if (channel <= kMaxDisableEncryptionChannel) { 2963 if (channel <= kMaxDisableEncryptionChannel) {
2956 static const char* const kWebRtcDevSwitchNames[] = { 2964 static const char* const kWebRtcDevSwitchNames[] = {
2957 switches::kDisableWebRtcEncryption, 2965 switches::kDisableWebRtcEncryption,
2958 }; 2966 };
2959 to_command_line->CopySwitchesFrom(from_command_line, 2967 to_command_line->CopySwitchesFrom(from_command_line,
2960 kWebRtcDevSwitchNames, 2968 kWebRtcDevSwitchNames,
2961 arraysize(kWebRtcDevSwitchNames)); 2969 arraysize(kWebRtcDevSwitchNames));
2962 } 2970 }
2963 } 2971 }
2964 #endif // defined(ENABLE_WEBRTC) 2972 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698