| Index: chrome/browser/ui/tab_helpers.cc
|
| diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
| index 811f959240daa10f8eef721e58cb4fe528c82ace..a8d1d09311fa90c7e317240de89da569c4e5ac96 100644
|
| --- a/chrome/browser/ui/tab_helpers.cc
|
| +++ b/chrome/browser/ui/tab_helpers.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/command_line.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/content_settings/tab_specific_content_settings.h"
|
| -#include "chrome/browser/extensions/tab_helper.h"
|
| #include "chrome/browser/favicon/favicon_tab_helper.h"
|
| #include "chrome/browser/history/history_tab_helper.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| @@ -63,6 +62,10 @@
|
| #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| +#include "chrome/browser/extensions/tab_helper.h"
|
| +#endif
|
| +
|
| #if defined(ENABLE_MANAGED_USERS)
|
| #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"
|
| #endif
|
| @@ -124,7 +127,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
| web_contents,
|
| autofill::ChromeAutofillClient::FromWebContents(web_contents));
|
| CoreTabHelper::CreateForWebContents(web_contents);
|
| - extensions::TabHelper::CreateForWebContents(web_contents);
|
| FaviconTabHelper::CreateForWebContents(web_contents);
|
| FindTabHelper::CreateForWebContents(web_contents);
|
| HistoryTabHelper::CreateForWebContents(web_contents);
|
| @@ -175,6 +177,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
| CaptivePortalTabHelper::CreateForWebContents(web_contents);
|
| #endif
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| + extensions::TabHelper::CreateForWebContents(web_contents);
|
| +#endif
|
| +
|
| #if defined(ENABLE_MANAGED_USERS)
|
| SupervisedUserNavigationObserver::CreateForWebContents(web_contents);
|
| #endif
|
|
|