Chromium Code Reviews| Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc |
| =================================================================== |
| --- chrome/browser/ui/tab_contents/tab_contents_wrapper.cc (revision 139100) |
| +++ chrome/browser/ui/tab_contents/tab_contents_wrapper.cc (working copy) |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/autofill/autofill_external_delegate.h" |
| #include "chrome/browser/autofill/autofill_manager.h" |
| #include "chrome/browser/automation/automation_tab_helper.h" |
| +#include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
| #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| #include "chrome/browser/download/download_request_limiter_observer.h" |
| #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" |
| @@ -90,6 +91,10 @@ |
| #endif |
| blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this)); |
| bookmark_tab_helper_.reset(new BookmarkTabHelper(this)); |
| +#if !defined(OS_ANDROID) |
|
cbentzel
2012/05/30 18:48:02
Should you add a #define such as ENABLE_CAPTIVE_PO
mmenke
2012/05/31 20:31:47
Done and tested, both with it enabled and not. I
|
| + captive_portal_tab_helper_.reset( |
| + new captive_portal::CaptivePortalTabHelper(profile(), web_contents())); |
| +#endif |
| constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this)); |
| core_tab_helper_.reset(new CoreTabHelper(contents)); |
| extension_tab_helper_.reset(new ExtensionTabHelper(this)); |