Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: chrome/browser/pepper_broker_infobar_delegate.cc

Issue 190063006: Infobar Componentization Proof of Concept (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor fixes Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/pepper_broker_infobar_delegate.cc
diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc
index 8cb250b2affb7df7b2343052a061ca0778d95e0b..dcc97ce710f86d80af8f7fcf3f86d221b16a44fd 100644
--- a/chrome/browser/pepper_broker_infobar_delegate.cc
+++ b/chrome/browser/pepper_broker_infobar_delegate.cc
@@ -56,9 +56,13 @@ void PepperBrokerInfoBarDelegate::Create(
InfoBarService::FromWebContents(web_contents);
infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
scoped_ptr<ConfirmInfoBarDelegate>(new PepperBrokerInfoBarDelegate(
- url, plugin_path,
+ web_contents,
+ url,
+ plugin_path,
profile->GetPrefs()->GetString(prefs::kAcceptLanguages),
- content_settings, tab_content_settings, callback))));
+ content_settings,
+ tab_content_settings,
+ callback))));
return;
}
@@ -71,20 +75,20 @@ void PepperBrokerInfoBarDelegate::Create(
}
PepperBrokerInfoBarDelegate::PepperBrokerInfoBarDelegate(
+ content::WebContents* web_contents,
const GURL& url,
const base::FilePath& plugin_path,
const std::string& languages,
HostContentSettingsMap* content_settings,
TabSpecificContentSettings* tab_content_settings,
const base::Callback<void(bool)>& callback)
- : ConfirmInfoBarDelegate(),
+ : ContentConfirmInfoBarDelegate(web_contents),
url_(url),
plugin_path_(plugin_path),
languages_(languages),
content_settings_(content_settings),
tab_content_settings_(tab_content_settings),
- callback_(callback) {
-}
+ callback_(callback) {}
PepperBrokerInfoBarDelegate::~PepperBrokerInfoBarDelegate() {
if (!callback_.is_null())

Powered by Google App Engine
This is Rietveld 408576698