diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 21:00:49 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 21:00:49 +0000 |
| commit | 51ffaf742c78f2fdd9833167c5534d8009873751 (patch) | |
| tree | acad7cf4038f246d01dd5852050cac7bd67b5aaf /chrome/browser/plugin_observer.cc | |
| parent | aaaab841d2e79745eb9e24ad873237509557fb53 (diff) | |
| download | chromium_src-51ffaf742c78f2fdd9833167c5534d8009873751.zip chromium_src-51ffaf742c78f2fdd9833167c5534d8009873751.tar.gz chromium_src-51ffaf742c78f2fdd9833167c5534d8009873751.tar.bz2 | |
Load only blocked plug-ins when allowing plug-ins from infobars.
BUG=126418
TEST=see bug for manual test
Review URL: https://chromiumcodereview.appspot.com/10384038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_observer.cc')
| -rw-r--r-- | chrome/browser/plugin_observer.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc index 34a708d..1b3e333 100644 --- a/chrome/browser/plugin_observer.cc +++ b/chrome/browser/plugin_observer.cc @@ -209,13 +209,15 @@ bool PluginObserver::OnMessageReceived(const IPC::Message& message) { return true; } -void PluginObserver::OnBlockedUnauthorizedPlugin(const string16& name) { +void PluginObserver::OnBlockedUnauthorizedPlugin( + const string16& name, + const std::string& identifier) { InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper(); infobar_helper->AddInfoBar( new UnauthorizedPluginInfoBarDelegate( infobar_helper, tab_contents_->profile()->GetHostContentSettingsMap(), - name)); + name, identifier)); } void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id, |