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

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

Issue 1316203006: Convert DeviceManagerDelegate to PermissionProvider mojo interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment and move ctor. Created 5 years, 3 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/usb/DEPS » ('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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 #endif 252 #endif
253 253
254 #if defined(ENABLE_WEBRTC) 254 #if defined(ENABLE_WEBRTC)
255 #include "chrome/browser/media/webrtc_logging_handler_host.h" 255 #include "chrome/browser/media/webrtc_logging_handler_host.h"
256 #endif 256 #endif
257 257
258 #if defined(ENABLE_MEDIA_ROUTER) 258 #if defined(ENABLE_MEDIA_ROUTER)
259 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 259 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
260 #endif 260 #endif
261 261
262 #if !defined(OS_ANDROID) && !defined(OS_IOS)
263 #include "chrome/browser/usb/web_usb_permission_provider.h"
264 #endif
265
262 using base::FileDescriptor; 266 using base::FileDescriptor;
263 using blink::WebWindowFeatures; 267 using blink::WebWindowFeatures;
264 using content::AccessTokenStore; 268 using content::AccessTokenStore;
265 using content::BrowserThread; 269 using content::BrowserThread;
266 using content::BrowserURLHandler; 270 using content::BrowserURLHandler;
267 using content::ChildProcessSecurityPolicy; 271 using content::ChildProcessSecurityPolicy;
268 using content::QuotaPermissionContext; 272 using content::QuotaPermissionContext;
269 using content::RenderFrameHost; 273 using content::RenderFrameHost;
270 using content::RenderViewHost; 274 using content::RenderViewHost;
271 using content::ResourceType; 275 using content::ResourceType;
(...skipping 2237 matching lines...) Expand 10 before | Expand all | Expand 10 after
2509 #endif 2513 #endif
2510 2514
2511 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( 2515 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
2512 content::ServiceRegistry* registry, 2516 content::ServiceRegistry* registry,
2513 content::RenderFrameHost* render_frame_host) { 2517 content::RenderFrameHost* render_frame_host) {
2514 #if defined(OS_CHROMEOS) 2518 #if defined(OS_CHROMEOS)
2515 registry->AddService( 2519 registry->AddService(
2516 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2520 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2517 render_frame_host)); 2521 render_frame_host));
2518 #endif 2522 #endif
2523 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2524 registry->AddService(
2525 base::Bind(&WebUSBPermissionProvider::Create, render_frame_host));
2526 #endif
2519 } 2527 }
2520 2528
2521 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2529 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2522 StaticMojoApplicationMap* apps) { 2530 StaticMojoApplicationMap* apps) {
2523 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2531 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2524 apps->insert(std::make_pair(GURL(device::kDevicesMojoAppUrl), 2532 apps->insert(std::make_pair(GURL(device::kDevicesMojoAppUrl),
2525 base::Bind(&device::DevicesAppFactory::CreateApp, 2533 base::Bind(&device::DevicesAppFactory::CreateApp,
2526 base::ThreadTaskRunnerHandle::Get()))); 2534 base::ThreadTaskRunnerHandle::Get())));
2527 #endif 2535 #endif
2528 } 2536 }
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2644 switches::kDisableWebRtcEncryption, 2652 switches::kDisableWebRtcEncryption,
2645 }; 2653 };
2646 to_command_line->CopySwitchesFrom(from_command_line, 2654 to_command_line->CopySwitchesFrom(from_command_line,
2647 kWebRtcDevSwitchNames, 2655 kWebRtcDevSwitchNames,
2648 arraysize(kWebRtcDevSwitchNames)); 2656 arraysize(kWebRtcDevSwitchNames));
2649 } 2657 }
2650 } 2658 }
2651 #endif // defined(ENABLE_WEBRTC) 2659 #endif // defined(ENABLE_WEBRTC)
2652 2660
2653 } // namespace chrome 2661 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698