| OLD | NEW |
| 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 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1758 fullscreen_controller_->LostMouseLock(); | 1758 fullscreen_controller_->LostMouseLock(); |
| 1759 } | 1759 } |
| 1760 | 1760 |
| 1761 void Browser::RequestMediaAccessPermission( | 1761 void Browser::RequestMediaAccessPermission( |
| 1762 content::WebContents* web_contents, | 1762 content::WebContents* web_contents, |
| 1763 const content::MediaStreamRequest& request, | 1763 const content::MediaStreamRequest& request, |
| 1764 const content::MediaResponseCallback& callback) { | 1764 const content::MediaResponseCallback& callback) { |
| 1765 ::RequestMediaAccessPermission(web_contents, profile_, request, callback); | 1765 ::RequestMediaAccessPermission(web_contents, profile_, request, callback); |
| 1766 } | 1766 } |
| 1767 | 1767 |
| 1768 void Browser::AllowMicAccessBasedOnPolicyAndAppPermissions( |
| 1769 WebContents* web_contents, |
| 1770 const GURL& security_origin, |
| 1771 const MediaAccessResponseCallback& callback) { |
| 1772 make it happen. |
| 1773 } |
| 1774 |
| 1768 bool Browser::RequestPpapiBrokerPermission( | 1775 bool Browser::RequestPpapiBrokerPermission( |
| 1769 WebContents* web_contents, | 1776 WebContents* web_contents, |
| 1770 const GURL& url, | 1777 const GURL& url, |
| 1771 const base::FilePath& plugin_path, | 1778 const base::FilePath& plugin_path, |
| 1772 const base::Callback<void(bool)>& callback) { | 1779 const base::Callback<void(bool)>& callback) { |
| 1773 PepperBrokerInfoBarDelegate::Create(web_contents, url, plugin_path, callback); | 1780 PepperBrokerInfoBarDelegate::Create(web_contents, url, plugin_path, callback); |
| 1774 return true; | 1781 return true; |
| 1775 } | 1782 } |
| 1776 | 1783 |
| 1777 gfx::Size Browser::GetSizeForNewRenderView(WebContents* web_contents) const { | 1784 gfx::Size Browser::GetSizeForNewRenderView(WebContents* web_contents) const { |
| (...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2477 if (contents && !allow_js_access) { | 2484 if (contents && !allow_js_access) { |
| 2478 contents->web_contents()->GetController().LoadURL( | 2485 contents->web_contents()->GetController().LoadURL( |
| 2479 target_url, | 2486 target_url, |
| 2480 content::Referrer(), | 2487 content::Referrer(), |
| 2481 content::PAGE_TRANSITION_LINK, | 2488 content::PAGE_TRANSITION_LINK, |
| 2482 std::string()); // No extra headers. | 2489 std::string()); // No extra headers. |
| 2483 } | 2490 } |
| 2484 | 2491 |
| 2485 return contents != NULL; | 2492 return contents != NULL; |
| 2486 } | 2493 } |
| OLD | NEW |