| Index: chrome/browser/plugin_infobar_delegates.h
|
| diff --git a/chrome/browser/plugin_infobar_delegates.h b/chrome/browser/plugin_infobar_delegates.h
|
| index 31be3e30eb6932d798f0077868eaec387468c921..03b18baedc6484c47a61c005f9e2f4511f938a0a 100644
|
| --- a/chrome/browser/plugin_infobar_delegates.h
|
| +++ b/chrome/browser/plugin_infobar_delegates.h
|
| @@ -13,14 +13,14 @@
|
| #include "chrome/browser/plugin_installer_observer.h"
|
| #endif // defined(ENABLE_PLUGIN_INSTALLATION)
|
|
|
| -class InfoBarTabService;
|
| +class InfoBarService;
|
| class HostContentSettingsMap;
|
| class PluginObserver;
|
|
|
| // Base class for blocked plug-in infobars.
|
| class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| public:
|
| - PluginInfoBarDelegate(InfoBarTabService* infobar_service,
|
| + PluginInfoBarDelegate(InfoBarService* infobar_service,
|
| const string16& name,
|
| const std::string& identifier);
|
|
|
| @@ -49,7 +49,7 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| // Infobar that's shown when a plug-in requires user authorization to run.
|
| class UnauthorizedPluginInfoBarDelegate : public PluginInfoBarDelegate {
|
| public:
|
| - UnauthorizedPluginInfoBarDelegate(InfoBarTabService* infobar_service,
|
| + UnauthorizedPluginInfoBarDelegate(InfoBarService* infobar_service,
|
| HostContentSettingsMap* content_settings,
|
| const string16& name,
|
| const std::string& identifier);
|
| @@ -108,7 +108,7 @@ class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
|
| void ReplaceWithInfoBar(const string16& message);
|
|
|
| // Has the same lifetime as TabContents, which owns us
|
| - // (transitively via InfoBarTabService).
|
| + // (transitively via InfoBarService).
|
| PluginObserver* observer_;
|
|
|
| string16 message_;
|
| @@ -125,14 +125,14 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
|
| // |installer|. When the user accepts, |callback| is called.
|
| // During installation of the plug-in, the infobar will change to reflect the
|
| // installation state.
|
| - static InfoBarDelegate* Create(InfoBarTabService* infobar_service,
|
| + static InfoBarDelegate* Create(InfoBarService* infobar_service,
|
| PluginInstaller* installer,
|
| const base::Closure& callback);
|
|
|
| private:
|
| friend class OutdatedPluginInfoBarDelegate;
|
|
|
| - PluginInstallerInfoBarDelegate(InfoBarTabService* infobar_service,
|
| + PluginInstallerInfoBarDelegate(InfoBarService* infobar_service,
|
| PluginInstaller* installer,
|
| const base::Closure& callback,
|
| bool new_install,
|
| @@ -177,10 +177,10 @@ class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| public:
|
| // Shows an infobar asking the user to switch to desktop chrome if they
|
| // want to use the plugin.
|
| - static InfoBarDelegate* Create(InfoBarTabService* infobar_service,
|
| + static InfoBarDelegate* Create(InfoBarService* infobar_service,
|
| const string16& plugin_name);
|
| private:
|
| - PluginMetroModeInfoBarDelegate(InfoBarTabService* infobar_service,
|
| + PluginMetroModeInfoBarDelegate(InfoBarService* infobar_service,
|
| const string16& message);
|
| virtual ~PluginMetroModeInfoBarDelegate();
|
|
|
|
|