Add infobar for PPAPI broker usage.

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 176 matching lines @@
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/dialogs/selected_file_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_service_data.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
+#include "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "ui/base/win/shell.h"
@@ skipping 25 matching lines @@
 namespace {
 
 // The URL to be loaded to display the "Report a broken page" form.
 const char kBrokenPageUrl[] =
     "https://www.google.com/support/chrome/bin/request.py?contact_type="
     "broken_website&format=inproduct&p.page_title=$1&p.page_url=$2";
 
 // The URL for the privacy dashboard.
 const char kPrivacyDashboardUrl[] = "https://www.google.com/dashboard";
 
+// The URL for the "learn more" article about the PPAPI broker.
+const char kPpapiBrokerLearnMoreUrl[] =
+    "https://support.google.com/chrome/?p=ib_pepper_broker";
+
 // How long we wait before updating the browser chrome while loading a page.
 const int kUIUpdateCoalescingTimeMS = 200;
 
 bool AllowPanels(const std::string& app_name) {
   return PanelManager::ShouldUsePanels(
       web_app::GetExtensionIdFromApplicationName(app_name));
 }
 
 BrowserWindow* CreateBrowserWindow(Browser* browser) {
 #if !defined(USE_ASH)
   if (browser->is_type_panel())
     return PanelManager::GetInstance()->CreatePanel(browser)->browser_window();
 #endif
   return BrowserWindow::CreateBrowserWindow(browser);
 }
 
 #if defined(OS_CHROMEOS)
 chrome::HostDesktopType kDefaultHostDesktopType = chrome::HOST_DESKTOP_TYPE_ASH;
 #else
 chrome::HostDesktopType kDefaultHostDesktopType =
     chrome::HOST_DESKTOP_TYPE_NATIVE;
 #endif
 
 
+class PpapiBrokerPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {

[sky, 2012/08/14 15:52:12]

Move this into its own .h/.cc

[Bernhard Bauer, 2012/08/14 23:36:24]

Done.

+ public:
+  PpapiBrokerPermissionInfoBarDelegate(
+      InfoBarTabHelper* helper,
+      const GURL& url,
+      const FilePath& plugin_path,
+      const std::string& languages,
+      HostContentSettingsMap* content_settings,
+      const base::Callback<void(bool)>& callback);
+  virtual ~PpapiBrokerPermissionInfoBarDelegate();
+
+  // ConfirmInfoBarDelegate:
+  virtual string16 GetMessageText() const OVERRIDE;
+  virtual int GetButtons() const OVERRIDE;
+  virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
+  virtual bool Accept() OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
+  virtual string16 GetLinkText() const OVERRIDE;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual gfx::Image* GetIcon() const OVERRIDE;
+
+ private:
+  GURL url_;

[sky, 2012/08/14 15:52:12]

Make members const where applicable.

[Bernhard Bauer, 2012/08/14 23:36:24]

Done.

+  FilePath plugin_path_;
+  std::string languages_;
+  HostContentSettingsMap* content_settings_;
+  base::Callback<void(bool)> callback_;
+};

[sky, 2012/08/14 15:52:12]

DISALLOW_...

[Bernhard Bauer, 2012/08/14 23:36:24]

Done.

+
+PpapiBrokerPermissionInfoBarDelegate::PpapiBrokerPermissionInfoBarDelegate(
+    InfoBarTabHelper* helper,
+    const GURL& url,
+    const FilePath& plugin_path,
+    const std::string& languages,
+    HostContentSettingsMap* content_settings,
+    const base::Callback<void(bool)>& callback)
+    : ConfirmInfoBarDelegate(helper),
+      url_(url),
+      plugin_path_(plugin_path),
+      languages_(languages),
+      content_settings_(content_settings),
+      callback_(callback) {
+}
+
+PpapiBrokerPermissionInfoBarDelegate::~PpapiBrokerPermissionInfoBarDelegate() {
+  if (!callback_.is_null())
+    callback_.Run(false);
+}
+
+string16 PpapiBrokerPermissionInfoBarDelegate::GetMessageText() const {
+  content::PluginService* plugin_service =
+      content::PluginService::GetInstance();
+  webkit::WebPluginInfo plugin;
+  bool success = plugin_service->GetPluginInfoByPath(plugin_path_, &plugin);
+  DCHECK(success);
+  scoped_ptr<webkit::npapi::PluginGroup> plugin_group(
+      plugin_service->GetPluginList()->GetPluginGroup(plugin));
+  return l10n_util::GetStringFUTF16(IDS_PPAPI_BROKER_INFOBAR_QUESTION,
+                                    plugin_group->GetGroupName(),
+                                    net::FormatUrl(url_, languages_));
+}
+
+int PpapiBrokerPermissionInfoBarDelegate::GetButtons() const {
+  return BUTTON_OK | BUTTON_CANCEL;
+}
+
+string16 PpapiBrokerPermissionInfoBarDelegate::GetButtonLabel(
+    InfoBarButton button) const {
+  switch (button) {
+    case BUTTON_OK:
+      return l10n_util::GetStringUTF16(IDS_PPAPI_BROKER_ALLOW_BUTTON);
+    case BUTTON_CANCEL:
+      return l10n_util::GetStringUTF16(IDS_PPAPI_BROKER_DENY_BUTTON);
+    default:
+      NOTREACHED();
+      return string16();
+  }
+}
+
+bool PpapiBrokerPermissionInfoBarDelegate::Accept() {
+  callback_.Run(true);
+  callback_ = base::Callback<void(bool)>();
+  content_settings_->SetContentSetting(
+      ContentSettingsPattern::FromURLNoWildcard(url_),
+      ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
+      std::string(), CONTENT_SETTING_ALLOW);
+  return true;
+}
+
+bool PpapiBrokerPermissionInfoBarDelegate::Cancel() {
+  callback_.Run(false);
+  callback_ = base::Callback<void(bool)>();
+  return true;
+}
+
+string16 PpapiBrokerPermissionInfoBarDelegate::GetLinkText() const {
+  return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
+}
+
+bool PpapiBrokerPermissionInfoBarDelegate::LinkClicked(
+    WindowOpenDisposition disposition) {
+  OpenURLParams params(
+      GURL(kPpapiBrokerLearnMoreUrl), Referrer(),
+      (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+      content::PAGE_TRANSITION_LINK,
+      false);
+  owner()->web_contents()->OpenURL(params);
+  return false;
+}
+
+gfx::Image* PpapiBrokerPermissionInfoBarDelegate::GetIcon() const {
+  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_INFOBAR_PLUGIN_INSTALL);
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams()
     : type(TYPE_TABBED),
       profile(NULL),
       host_desktop_type(kDefaultHostDesktopType),
       app_type(APP_TYPE_HOST),
@@ skipping 697 matching lines @@
     InfoBarDelegate* infobar =
         new MediaStreamInfoBarDelegate(infobar_helper, controller.release());
     if (old_infobar)
       infobar_helper->ReplaceInfoBar(old_infobar, infobar);
     else
       infobar_helper->AddInfoBar(infobar);
   }
 }
 
 // static
 void Browser::RequestPpapiBrokerPermissionHelper(

[sky, 2012/08/14 15:52:12]

Why does this need to live in Browser?

[Bernhard Bauer, 2012/08/14 23:36:24]

Browser is the "standard" implementation of WebContentsDelegate for this
infobar. Other implementations (ExternalTabContainerWin) delegate to this one.
This is modeled after similar infobars like the one for media access above  or
the one for protocol handlers.

[sky, 2012/08/15 02:29:34]

Who is calling it directly in browser.cc though? I don't see it on tip of tree,
so maybe it moved?

[Bernhard Bauer, 2012/08/15 09:36:53]

Browser::RequestPpapiBrokerPermission() does, which isn't on trunk yet (it's in
http://codereview.chromium.org/10854040/, which this CL depends on. I'm trying
to pipeline them).

     WebContents* web_contents,
     const GURL& url,
     const FilePath& plugin_path,
     const base::Callback<void(bool)>& callback) {
-  // TODO(bauerb): Request permission.
-  callback.Run(true);
+  TabContents* tab = TabContents::FromWebContents(web_contents);
+  if (!tab) {
+    callback.Run(false);
+    return;
+  }
+
+  Profile* profile = tab->profile();
+  // Disallow broker access in incognito mode.
+  if (profile->IsOffTheRecord() || Profile::IsGuestSession()) {
+    callback.Run(false);
+    return;
+  }
+
+  HostContentSettingsMap* content_settings =
+      profile->GetHostContentSettingsMap();
+  ContentSetting setting =
+      content_settings->GetContentSetting(url, url,
+                                          CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
+                                          std::string());
+  switch (setting) {
+    case CONTENT_SETTING_ALLOW: {
+      callback.Run(true);
+      break;
+    }
+    case CONTENT_SETTING_BLOCK: {
+      callback.Run(false);
+      break;
+    }
+    case CONTENT_SETTING_ASK: {
+      InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
+      std::string languages =
+          profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
+      infobar_helper->AddInfoBar(
+          new PpapiBrokerPermissionInfoBarDelegate(
+              infobar_helper, url, plugin_path, languages, content_settings,
+              callback));
+      break;
+    }
+    default:
+      NOTREACHED();
+  }
 }
 
 void Browser::UpdateUIForNavigationInTab(TabContents* contents,
                                          content::PageTransition transition,
                                          bool user_initiated) {
   tab_strip_model_->TabNavigating(contents, transition);
 
   bool contents_is_selected = contents == chrome::GetActiveTabContents(this);
   if (user_initiated && contents_is_selected && window()->GetLocationBar()) {
     // Forcibly reset the location bar if the url is going to change in the
@@ skipping 1338 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }