diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-23 18:57:16 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-23 18:57:16 +0000 |
| commit | 8c8fc29e21510bfd89bef9d2e4301270e4aa91a0 (patch) | |
| tree | 1b5f36252be42cad3e308dbf91d015a40673b944 /chrome/browser/ui/browser.cc | |
| parent | 7452c1cc4e6c88305b3f221beb0ba0244b2afcee (diff) | |
| download | chromium_src-8c8fc29e21510bfd89bef9d2e4301270e4aa91a0.zip chromium_src-8c8fc29e21510bfd89bef9d2e4301270e4aa91a0.tar.gz chromium_src-8c8fc29e21510bfd89bef9d2e4301270e4aa91a0.tar.bz2 | |
Move RequestPpapiBrokerPermission from WebContentsObserver to WebContentsDelegate.
TBR=joth@chromium.org
BUG=142639
Review URL: https://chromiumcodereview.appspot.com/11416013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
| -rw-r--r-- | chrome/browser/ui/browser.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 8fa3c3f..7d9721b 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -67,6 +67,7 @@ #include "chrome/browser/media/media_stream_devices_controller.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/notifications/notification_ui_manager.h" +#include "chrome/browser/pepper_broker_infobar_delegate.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/prefs/pref_service.h" @@ -1766,6 +1767,15 @@ void Browser::RequestMediaAccessPermission( RequestMediaAccessPermissionHelper(web_contents, request, callback); } +bool Browser::RequestPpapiBrokerPermission( + WebContents* web_contents, + const GURL& url, + const FilePath& plugin_path, + const base::Callback<void(bool)>& callback) { + PepperBrokerInfoBarDelegate::Show(web_contents, url, plugin_path, callback); + return true; +} + /////////////////////////////////////////////////////////////////////////////// // Browser, CoreTabHelperDelegate implementation: |