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

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

Issue 1125333003: Remove CheckMediaAccessPermission() from ContentBrowserClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2314 matching lines...) Expand 10 before | Expand all | Expand 10 after
2325 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, 2325 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
2326 sandbox::TargetPolicy::HANDLES_DUP_ANY, 2326 sandbox::TargetPolicy::HANDLES_DUP_ANY,
2327 L"File"); 2327 L"File");
2328 if (result != sandbox::SBOX_ALL_OK) { 2328 if (result != sandbox::SBOX_ALL_OK) {
2329 *success = false; 2329 *success = false;
2330 return; 2330 return;
2331 } 2331 }
2332 } 2332 }
2333 #endif 2333 #endif
2334 2334
2335 bool ChromeContentBrowserClient::CheckMediaAccessPermission(
2336 content::BrowserContext* browser_context,
2337 const GURL& security_origin,
2338 content::MediaStreamType type) {
2339 return MediaCaptureDevicesDispatcher::GetInstance()
2340 ->CheckMediaAccessPermission(
2341 browser_context, security_origin, type);
2342 }
2343
2344 void ChromeContentBrowserClient::OpenURL( 2335 void ChromeContentBrowserClient::OpenURL(
2345 content::BrowserContext* browser_context, 2336 content::BrowserContext* browser_context,
2346 const content::OpenURLParams& params, 2337 const content::OpenURLParams& params,
2347 const base::Callback<void(content::WebContents*)>& callback) { 2338 const base::Callback<void(content::WebContents*)>& callback) {
2348 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2339 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2349 2340
2350 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2341 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2351 NavigateParams nav_params(Profile::FromBrowserContext(browser_context), 2342 NavigateParams nav_params(Profile::FromBrowserContext(browser_context),
2352 params.url, 2343 params.url,
2353 params.transition); 2344 params.transition);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
2445 switches::kDisableWebRtcEncryption, 2436 switches::kDisableWebRtcEncryption,
2446 }; 2437 };
2447 to_command_line->CopySwitchesFrom(from_command_line, 2438 to_command_line->CopySwitchesFrom(from_command_line,
2448 kWebRtcDevSwitchNames, 2439 kWebRtcDevSwitchNames,
2449 arraysize(kWebRtcDevSwitchNames)); 2440 arraysize(kWebRtcDevSwitchNames));
2450 } 2441 }
2451 } 2442 }
2452 #endif // defined(ENABLE_WEBRTC) 2443 #endif // defined(ENABLE_WEBRTC)
2453 2444
2454 } // namespace chrome 2445 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/media/media_capture_devices_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698