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

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

Issue 1053773007: Add Platform Verification Mojo Services. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn build Created 5 years, 7 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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 #include "content/public/browser/child_process_security_policy.h" 112 #include "content/public/browser/child_process_security_policy.h"
113 #include "content/public/browser/client_certificate_delegate.h" 113 #include "content/public/browser/client_certificate_delegate.h"
114 #include "content/public/browser/render_frame_host.h" 114 #include "content/public/browser/render_frame_host.h"
115 #include "content/public/browser/render_process_host.h" 115 #include "content/public/browser/render_process_host.h"
116 #include "content/public/browser/render_view_host.h" 116 #include "content/public/browser/render_view_host.h"
117 #include "content/public/browser/resource_context.h" 117 #include "content/public/browser/resource_context.h"
118 #include "content/public/browser/site_instance.h" 118 #include "content/public/browser/site_instance.h"
119 #include "content/public/browser/web_contents.h" 119 #include "content/public/browser/web_contents.h"
120 #include "content/public/common/child_process_host.h" 120 #include "content/public/common/child_process_host.h"
121 #include "content/public/common/content_descriptors.h" 121 #include "content/public/common/content_descriptors.h"
122 #include "content/public/common/service_registry.h"
122 #include "content/public/common/url_utils.h" 123 #include "content/public/common/url_utils.h"
123 #include "content/public/common/web_preferences.h" 124 #include "content/public/common/web_preferences.h"
124 #include "gin/v8_initializer.h" 125 #include "gin/v8_initializer.h"
125 #include "net/base/mime_util.h" 126 #include "net/base/mime_util.h"
126 #include "net/cookies/canonical_cookie.h" 127 #include "net/cookies/canonical_cookie.h"
127 #include "net/cookies/cookie_options.h" 128 #include "net/cookies/cookie_options.h"
128 #include "net/ssl/ssl_cert_request_info.h" 129 #include "net/ssl/ssl_cert_request_info.h"
129 #include "ppapi/host/ppapi_host.h" 130 #include "ppapi/host/ppapi_host.h"
130 #include "storage/browser/fileapi/external_mount_points.h" 131 #include "storage/browser/fileapi/external_mount_points.h"
131 #include "ui/base/l10n/l10n_util.h" 132 #include "ui/base/l10n/l10n_util.h"
132 #include "ui/base/resource/resource_bundle.h" 133 #include "ui/base/resource/resource_bundle.h"
133 #include "ui/resources/grit/ui_resources.h" 134 #include "ui/resources/grit/ui_resources.h"
134 135
135 #if defined(OS_WIN) 136 #if defined(OS_WIN)
136 #include "base/win/windows_version.h" 137 #include "base/win/windows_version.h"
137 #include "chrome/browser/chrome_browser_main_win.h" 138 #include "chrome/browser/chrome_browser_main_win.h"
138 #include "sandbox/win/src/sandbox_policy.h" 139 #include "sandbox/win/src/sandbox_policy.h"
139 #elif defined(OS_MACOSX) 140 #elif defined(OS_MACOSX)
140 #include "chrome/browser/chrome_browser_main_mac.h" 141 #include "chrome/browser/chrome_browser_main_mac.h"
141 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 142 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
142 #elif defined(OS_CHROMEOS) 143 #elif defined(OS_CHROMEOS)
144 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h"
143 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 145 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
144 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" 146 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
145 #include "chrome/browser/chromeos/file_manager/app_id.h" 147 #include "chrome/browser/chromeos/file_manager/app_id.h"
146 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h" 148 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate. h"
147 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 149 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
148 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" 150 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
149 #include "chrome/browser/chromeos/login/startup_utils.h" 151 #include "chrome/browser/chromeos/login/startup_utils.h"
150 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 152 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
151 #include "chrome/browser/chromeos/system/input_device_settings.h" 153 #include "chrome/browser/chromeos/system/input_device_settings.h"
152 #include "chromeos/chromeos_switches.h" 154 #include "chromeos/chromeos_switches.h"
(...skipping 2174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2327 2329
2328 bool ChromeContentBrowserClient::CheckMediaAccessPermission( 2330 bool ChromeContentBrowserClient::CheckMediaAccessPermission(
2329 content::BrowserContext* browser_context, 2331 content::BrowserContext* browser_context,
2330 const GURL& security_origin, 2332 const GURL& security_origin,
2331 content::MediaStreamType type) { 2333 content::MediaStreamType type) {
2332 return MediaCaptureDevicesDispatcher::GetInstance() 2334 return MediaCaptureDevicesDispatcher::GetInstance()
2333 ->CheckMediaAccessPermission( 2335 ->CheckMediaAccessPermission(
2334 browser_context, security_origin, type); 2336 browser_context, security_origin, type);
2335 } 2337 }
2336 2338
2339 void ChromeContentBrowserClient::OverrideRenderFrameMojoServices(
2340 content::ServiceRegistry* registry,
2341 content::RenderFrameHost* render_frame_host) {
2342 #if defined(OS_CHROMEOS)
2343 registry->AddService(
2344 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2345 render_frame_host));
xhwang 2015/05/05 21:53:03 Currently nobody is using these services, so I can
2346 #endif
2347 }
2348
2337 void ChromeContentBrowserClient::OpenURL( 2349 void ChromeContentBrowserClient::OpenURL(
2338 content::BrowserContext* browser_context, 2350 content::BrowserContext* browser_context,
2339 const content::OpenURLParams& params, 2351 const content::OpenURLParams& params,
2340 const base::Callback<void(content::WebContents*)>& callback) { 2352 const base::Callback<void(content::WebContents*)>& callback) {
2341 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2353 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2342 2354
2343 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2355 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2344 NavigateParams nav_params(Profile::FromBrowserContext(browser_context), 2356 NavigateParams nav_params(Profile::FromBrowserContext(browser_context),
2345 params.url, 2357 params.url,
2346 params.transition); 2358 params.transition);
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
2442 switches::kDisableWebRtcEncryption, 2454 switches::kDisableWebRtcEncryption,
2443 }; 2455 };
2444 to_command_line->CopySwitchesFrom(from_command_line, 2456 to_command_line->CopySwitchesFrom(from_command_line,
2445 kWebRtcDevSwitchNames, 2457 kWebRtcDevSwitchNames,
2446 arraysize(kWebRtcDevSwitchNames)); 2458 arraysize(kWebRtcDevSwitchNames));
2447 } 2459 }
2448 } 2460 }
2449 #endif // defined(ENABLE_WEBRTC) 2461 #endif // defined(ENABLE_WEBRTC)
2450 2462
2451 } // namespace chrome 2463 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698