From 8c8fc29e21510bfd89bef9d2e4301270e4aa91a0 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Fri, 23 Nov 2012 18:57:16 +0000 Subject: 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 --- chrome/browser/ui/browser.cc | 10 ++++++++++ chrome/browser/ui/browser.h | 5 +++++ chrome/browser/ui/tab_contents/tab_contents.cc | 2 -- chrome/browser/ui/views/external_tab_container_win.cc | 10 ++++++++++ chrome/browser/ui/views/external_tab_container_win.h | 5 +++++ 5 files changed, 30 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ui') 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& callback) { + PepperBrokerInfoBarDelegate::Show(web_contents, url, plugin_path, callback); + return true; +} + /////////////////////////////////////////////////////////////////////////////// // Browser, CoreTabHelperDelegate implementation: diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 87882e2..b7f3962 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -672,6 +672,11 @@ class Browser : public TabStripModelObserver, content::WebContents* web_contents, const content::MediaStreamRequest* request, const content::MediaResponseCallback& callback) OVERRIDE; + virtual bool RequestPpapiBrokerPermission( + content::WebContents* web_contents, + const GURL& url, + const FilePath& plugin_path, + const base::Callback& callback) OVERRIDE; // Overridden from CoreTabHelperDelegate: // Note that the caller is responsible for deleting |old_tab_contents|. diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc index d49d306..539af56 100644 --- a/chrome/browser/ui/tab_contents/tab_contents.cc +++ b/chrome/browser/ui/tab_contents/tab_contents.cc @@ -22,7 +22,6 @@ #include "chrome/browser/omnibox_search_hint.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/password_manager/password_manager_delegate_impl.h" -#include "chrome/browser/pepper_broker_observer.h" #include "chrome/browser/plugins/plugin_observer.h" #include "chrome/browser/prerender/prerender_tab_helper.h" #include "chrome/browser/printing/print_preview_message_handler.h" @@ -151,7 +150,6 @@ TabContents::TabContents(WebContents* contents) PasswordManagerDelegateImpl::CreateForWebContents(contents); PasswordManager::CreateForWebContentsAndDelegate( contents, PasswordManagerDelegateImpl::FromWebContents(contents)); - PepperBrokerObserver::CreateForWebContents(contents); PluginObserver::CreateForWebContents(contents); PrefsTabHelper::CreateForWebContents(contents); prerender::PrerenderTabHelper::CreateForWebContents(contents); diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc index bab0013..8533731 100644 --- a/chrome/browser/ui/views/external_tab_container_win.cc +++ b/chrome/browser/ui/views/external_tab_container_win.cc @@ -25,6 +25,7 @@ #include "chrome/browser/history/history_tab_helper.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/infobars/infobar_tab_helper.h" +#include "chrome/browser/pepper_broker_infobar_delegate.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/repost_form_warning_controller.h" #include "chrome/browser/themes/theme_service.h" @@ -826,6 +827,15 @@ void ExternalTabContainerWin::RequestMediaAccessPermission( Browser::RequestMediaAccessPermissionHelper(web_contents, request, callback); } +bool ExternalTabContainerWin::RequestPpapiBrokerPermission( + WebContents* web_contents, + const GURL& url, + const FilePath& plugin_path, + const base::Callback& callback) { + PepperBrokerInfoBarDelegate::Show(web_contents, url, plugin_path, callback); + return true; +} + bool ExternalTabContainerWin::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ExternalTabContainerWin, message) diff --git a/chrome/browser/ui/views/external_tab_container_win.h b/chrome/browser/ui/views/external_tab_container_win.h index 42868d1..9b9a8e1 100644 --- a/chrome/browser/ui/views/external_tab_container_win.h +++ b/chrome/browser/ui/views/external_tab_container_win.h @@ -179,6 +179,11 @@ class ExternalTabContainerWin : public ExternalTabContainer, content::WebContents* web_contents, const content::MediaStreamRequest* request, const content::MediaResponseCallback& callback) OVERRIDE; + virtual bool RequestPpapiBrokerPermission( + content::WebContents* web_contents, + const GURL& url, + const FilePath& plugin_path, + const base::Callback& callback) OVERRIDE; void RegisterRenderViewHost(content::RenderViewHost* render_view_host); void UnregisterRenderViewHost(content::RenderViewHost* render_view_host); -- cgit v1.1