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

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: Rebase Created 4 years, 9 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle .h" 189 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle .h"
190 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" 190 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h"
191 #include "chrome/browser/chromeos/login/startup_utils.h" 191 #include "chrome/browser/chromeos/login/startup_utils.h"
192 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 192 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
193 #include "chrome/browser/chromeos/system/input_device_settings.h" 193 #include "chrome/browser/chromeos/system/input_device_settings.h"
194 #include "chromeos/chromeos_switches.h" 194 #include "chromeos/chromeos_switches.h"
195 #include "components/user_manager/user_manager.h" 195 #include "components/user_manager/user_manager.h"
196 #elif defined(OS_LINUX) 196 #elif defined(OS_LINUX)
197 #include "chrome/browser/chrome_browser_main_linux.h" 197 #include "chrome/browser/chrome_browser_main_linux.h"
198 #elif defined(OS_ANDROID) 198 #elif defined(OS_ANDROID)
199 #include "chrome/browser/android/mojo/chrome_service_registrar.h"
199 #include "chrome/browser/chrome_browser_main_android.h" 200 #include "chrome/browser/chrome_browser_main_android.h"
200 #include "chrome/common/descriptors_android.h" 201 #include "chrome/common/descriptors_android.h"
201 #include "components/crash/content/browser/crash_dump_manager_android.h" 202 #include "components/crash/content/browser/crash_dump_manager_android.h"
202 #include "components/navigation_interception/intercept_navigation_delegate.h" 203 #include "components/navigation_interception/intercept_navigation_delegate.h"
203 #include "components/offline_pages/offline_page_switches.h" 204 #include "components/offline_pages/offline_page_switches.h"
204 #include "ui/base/resource/resource_bundle_android.h" 205 #include "ui/base/resource/resource_bundle_android.h"
205 #elif defined(OS_POSIX) 206 #elif defined(OS_POSIX)
206 #include "chrome/browser/chrome_browser_main_posix.h" 207 #include "chrome/browser/chrome_browser_main_posix.h"
207 #endif 208 #endif
208 209
(...skipping 2566 matching lines...) Expand 10 before | Expand all | Expand 10 after
2775 } 2776 }
2776 2777
2777 return false; 2778 return false;
2778 } 2779 }
2779 2780
2780 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { 2781 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const {
2781 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument; 2782 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument;
2782 } 2783 }
2783 #endif // defined(OS_WIN) 2784 #endif // defined(OS_WIN)
2784 2785
2786 #if BUILDFLAG(ANDROID_JAVA_UI)
2787 void ChromeContentBrowserClient::RegisterRenderProcessAndroidMojoServices(
2788 content::ServiceRegistryAndroid* registry) {
2789 ChromeServiceRegistrar::RegisterProcessHostServicesForUI(registry);
2790 }
2791 #endif
2792
2785 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( 2793 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
2786 content::ServiceRegistry* registry, 2794 content::ServiceRegistry* registry,
2787 content::RenderFrameHost* render_frame_host) { 2795 content::RenderFrameHost* render_frame_host) {
2788 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. 2796 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
2789 #if defined(OS_CHROMEOS) 2797 #if defined(OS_CHROMEOS)
2790 registry->AddService( 2798 registry->AddService(
2791 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2799 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2792 render_frame_host)); 2800 render_frame_host));
2793 #endif // defined(OS_CHROMEOS) 2801 #endif // defined(OS_CHROMEOS)
2794 2802
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2986 if (channel <= kMaxDisableEncryptionChannel) { 2994 if (channel <= kMaxDisableEncryptionChannel) {
2987 static const char* const kWebRtcDevSwitchNames[] = { 2995 static const char* const kWebRtcDevSwitchNames[] = {
2988 switches::kDisableWebRtcEncryption, 2996 switches::kDisableWebRtcEncryption,
2989 }; 2997 };
2990 to_command_line->CopySwitchesFrom(from_command_line, 2998 to_command_line->CopySwitchesFrom(from_command_line,
2991 kWebRtcDevSwitchNames, 2999 kWebRtcDevSwitchNames,
2992 arraysize(kWebRtcDevSwitchNames)); 3000 arraysize(kWebRtcDevSwitchNames));
2993 } 3001 }
2994 } 3002 }
2995 #endif // defined(ENABLE_WEBRTC) 3003 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698