| Index: chrome/browser/extensions/extension_disabled_infobar_delegate.cc
|
| diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
|
| index f1ec3212b3f73ef61ac9b84b19353e47613085bb..f75ed27735674e1717ef7fe7c748c1d3221d6539 100644
|
| --- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
|
| +++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
|
| @@ -9,7 +9,7 @@
|
| #include "app/l10n_util.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/extensions/extension_install_ui.h"
|
| -#include "chrome/browser/extensions/extensions_service.h"
|
| +#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/tab_contents/infobar_delegate.h"
|
| #include "chrome/browser/tab_contents/tab_contents.h"
|
| #include "chrome/browser/browser_list.h"
|
| @@ -24,7 +24,7 @@ class ExtensionDisabledDialogDelegate
|
| public base::RefCountedThreadSafe<ExtensionDisabledDialogDelegate> {
|
| public:
|
| ExtensionDisabledDialogDelegate(Profile* profile,
|
| - ExtensionsService* service,
|
| + ExtensionService* service,
|
| const Extension* extension)
|
| : service_(service), extension_(extension) {
|
| AddRef(); // Balanced in Proceed or Abort.
|
| @@ -51,7 +51,7 @@ class ExtensionDisabledDialogDelegate
|
| // The UI for showing the install dialog when enabling.
|
| scoped_ptr<ExtensionInstallUI> install_ui_;
|
|
|
| - ExtensionsService* service_;
|
| + ExtensionService* service_;
|
| const Extension* extension_;
|
| };
|
|
|
| @@ -60,7 +60,7 @@ class ExtensionDisabledInfobarDelegate
|
| public NotificationObserver {
|
| public:
|
| ExtensionDisabledInfobarDelegate(TabContents* tab_contents,
|
| - ExtensionsService* service,
|
| + ExtensionService* service,
|
| const Extension* extension)
|
| : ConfirmInfoBarDelegate(tab_contents),
|
| tab_contents_(tab_contents),
|
| @@ -121,11 +121,11 @@ class ExtensionDisabledInfobarDelegate
|
| private:
|
| NotificationRegistrar registrar_;
|
| TabContents* tab_contents_;
|
| - ExtensionsService* service_;
|
| + ExtensionService* service_;
|
| const Extension* extension_;
|
| };
|
|
|
| -void ShowExtensionDisabledUI(ExtensionsService* service, Profile* profile,
|
| +void ShowExtensionDisabledUI(ExtensionService* service, Profile* profile,
|
| const Extension* extension) {
|
| Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
|
| if (!browser)
|
| @@ -139,7 +139,7 @@ void ShowExtensionDisabledUI(ExtensionsService* service, Profile* profile,
|
| tab_contents, service, extension));
|
| }
|
|
|
| -void ShowExtensionDisabledDialog(ExtensionsService* service, Profile* profile,
|
| +void ShowExtensionDisabledDialog(ExtensionService* service, Profile* profile,
|
| const Extension* extension) {
|
| // This object manages its own lifetime.
|
| new ExtensionDisabledDialogDelegate(profile, service, extension);
|
|
|