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

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

Issue 562263002: Check media permissions through RenderFrameHostDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render_frame_get_sources
Patch Set: git cl format. Don't blame me. Created 6 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 1743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 fullscreen_controller_->LostMouseLock(); 1754 fullscreen_controller_->LostMouseLock();
1755 } 1755 }
1756 1756
1757 void Browser::RequestMediaAccessPermission( 1757 void Browser::RequestMediaAccessPermission(
1758 content::WebContents* web_contents, 1758 content::WebContents* web_contents,
1759 const content::MediaStreamRequest& request, 1759 const content::MediaStreamRequest& request,
1760 const content::MediaResponseCallback& callback) { 1760 const content::MediaResponseCallback& callback) {
1761 ::RequestMediaAccessPermission(web_contents, profile_, request, callback); 1761 ::RequestMediaAccessPermission(web_contents, profile_, request, callback);
1762 } 1762 }
1763 1763
1764 bool Browser::CheckMediaAccessPermission(content::WebContents* web_contents,
1765 const GURL& security_origin,
1766 content::MediaStreamType type) {
1767 return ::CheckMediaAccessPermission(web_contents, security_origin, type);
1768 }
1769
1764 bool Browser::RequestPpapiBrokerPermission( 1770 bool Browser::RequestPpapiBrokerPermission(
1765 WebContents* web_contents, 1771 WebContents* web_contents,
1766 const GURL& url, 1772 const GURL& url,
1767 const base::FilePath& plugin_path, 1773 const base::FilePath& plugin_path,
1768 const base::Callback<void(bool)>& callback) { 1774 const base::Callback<void(bool)>& callback) {
1769 PepperBrokerInfoBarDelegate::Create(web_contents, url, plugin_path, callback); 1775 PepperBrokerInfoBarDelegate::Create(web_contents, url, plugin_path, callback);
1770 return true; 1776 return true;
1771 } 1777 }
1772 1778
1773 gfx::Size Browser::GetSizeForNewRenderView(WebContents* web_contents) const { 1779 gfx::Size Browser::GetSizeForNewRenderView(WebContents* web_contents) const {
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
2472 if (contents && !allow_js_access) { 2478 if (contents && !allow_js_access) {
2473 contents->web_contents()->GetController().LoadURL( 2479 contents->web_contents()->GetController().LoadURL(
2474 target_url, 2480 target_url,
2475 content::Referrer(), 2481 content::Referrer(),
2476 content::PAGE_TRANSITION_LINK, 2482 content::PAGE_TRANSITION_LINK,
2477 std::string()); // No extra headers. 2483 std::string()); // No extra headers.
2478 } 2484 }
2479 2485
2480 return contents != NULL; 2486 return contents != NULL;
2481 } 2487 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698