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

Unified Diff: chrome/browser/plugins/plugin_infobar_delegates.cc

Issue 812823002: Remove dependency of infobars component on the embedder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation on android/win Created 6 years 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/plugins/plugin_infobar_delegates.cc
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc
index 789b278c1cc32394dbbb419903460d3a518e9478..0a1a91931d7bf1375f8e316d44760fb2d963531b 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -92,6 +92,7 @@ void OutdatedPluginInfoBarDelegate::Create(
// will make it impossible to get at.
base::string16 name(plugin_metadata->name());
infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+ infobar_service,
scoped_ptr<ConfirmInfoBarDelegate>(new OutdatedPluginInfoBarDelegate(
installer, plugin_metadata.Pass(), l10n_util::GetStringFUTF16(
(installer->state() == PluginInstaller::INSTALLER_STATE_IDLE) ?
@@ -233,6 +234,7 @@ void PluginInstallerInfoBarDelegate::Create(
}
#endif
infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+ infobar_service,
scoped_ptr<ConfirmInfoBarDelegate>(new PluginInstallerInfoBarDelegate(
installer, plugin_metadata.Pass(), callback, true,
l10n_util::GetStringFUTF16(
@@ -249,9 +251,11 @@ void PluginInstallerInfoBarDelegate::Replace(
bool new_install,
const base::string16& message) {
DCHECK(infobar->owner());
- infobar->owner()->ReplaceInfoBar(infobar,
- ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
- new PluginInstallerInfoBarDelegate(
+ infobar->owner()->ReplaceInfoBar(
+ infobar,
+ ConfirmInfoBarDelegate::CreateInfoBar(
+ infobar->owner(),
+ scoped_ptr<ConfirmInfoBarDelegate>(new PluginInstallerInfoBarDelegate(
installer, plugin_metadata.Pass(),
PluginInstallerInfoBarDelegate::InstallCallback(), new_install,
message))));
@@ -366,8 +370,8 @@ void PluginMetroModeInfoBarDelegate::Create(
PluginMetroModeInfoBarDelegate::Mode mode,
const base::string16& name) {
infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
- scoped_ptr<ConfirmInfoBarDelegate>(
- new PluginMetroModeInfoBarDelegate(mode, name))));
+ infobar_service, scoped_ptr<ConfirmInfoBarDelegate>(
+ new PluginMetroModeInfoBarDelegate(mode, name))));
}
PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(

Powered by Google App Engine
This is Rietveld 408576698