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 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1817 const content::MediaResponseCallback& callback) { | 1817 const content::MediaResponseCallback& callback) { |
1818 ::RequestMediaAccessPermission(web_contents, profile_, request, callback); | 1818 ::RequestMediaAccessPermission(web_contents, profile_, request, callback); |
1819 } | 1819 } |
1820 | 1820 |
1821 bool Browser::CheckMediaAccessPermission(content::WebContents* web_contents, | 1821 bool Browser::CheckMediaAccessPermission(content::WebContents* web_contents, |
1822 const GURL& security_origin, | 1822 const GURL& security_origin, |
1823 content::MediaStreamType type) { | 1823 content::MediaStreamType type) { |
1824 return ::CheckMediaAccessPermission(web_contents, security_origin, type); | 1824 return ::CheckMediaAccessPermission(web_contents, security_origin, type); |
1825 } | 1825 } |
1826 | 1826 |
| 1827 std::string Browser::GetDefaultMediaDeviceId(content::WebContents* web_contents, |
| 1828 content::MediaStreamType type) { |
| 1829 return ::GetDefaultMediaDeviceId(web_contents, type); |
| 1830 } |
| 1831 |
1827 bool Browser::RequestPpapiBrokerPermission( | 1832 bool Browser::RequestPpapiBrokerPermission( |
1828 WebContents* web_contents, | 1833 WebContents* web_contents, |
1829 const GURL& url, | 1834 const GURL& url, |
1830 const base::FilePath& plugin_path, | 1835 const base::FilePath& plugin_path, |
1831 const base::Callback<void(bool)>& callback) { | 1836 const base::Callback<void(bool)>& callback) { |
1832 PepperBrokerInfoBarDelegate::Create(web_contents, url, plugin_path, callback); | 1837 PepperBrokerInfoBarDelegate::Create(web_contents, url, plugin_path, callback); |
1833 return true; | 1838 return true; |
1834 } | 1839 } |
1835 | 1840 |
1836 gfx::Size Browser::GetSizeForNewRenderView(WebContents* web_contents) const { | 1841 gfx::Size Browser::GetSizeForNewRenderView(WebContents* web_contents) const { |
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2580 // new window later, thus we need to navigate the window now. | 2585 // new window later, thus we need to navigate the window now. |
2581 if (contents) { | 2586 if (contents) { |
2582 contents->web_contents()->GetController().LoadURL( | 2587 contents->web_contents()->GetController().LoadURL( |
2583 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, | 2588 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, |
2584 std::string()); // No extra headers. | 2589 std::string()); // No extra headers. |
2585 } | 2590 } |
2586 } | 2591 } |
2587 | 2592 |
2588 return contents != NULL; | 2593 return contents != NULL; |
2589 } | 2594 } |
OLD | NEW |