OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 5 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "chrome/browser/autocomplete_history_manager.h" | 9 #include "chrome/browser/autocomplete_history_manager.h" |
10 #include "chrome/browser/autofill/autofill_external_delegate.h" | 10 #include "chrome/browser/autofill/autofill_external_delegate.h" |
11 #include "chrome/browser/autofill/autofill_manager.h" | 11 #include "chrome/browser/autofill/autofill_manager.h" |
12 #include "chrome/browser/automation/automation_tab_helper.h" | 12 #include "chrome/browser/automation/automation_tab_helper.h" |
13 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | |
13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 14 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
14 #include "chrome/browser/download/download_request_limiter_observer.h" | 15 #include "chrome/browser/download/download_request_limiter_observer.h" |
15 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" | 16 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" |
16 #include "chrome/browser/extensions/extension_tab_helper.h" | 17 #include "chrome/browser/extensions/extension_tab_helper.h" |
17 #include "chrome/browser/external_protocol/external_protocol_observer.h" | 18 #include "chrome/browser/external_protocol/external_protocol_observer.h" |
18 #include "chrome/browser/favicon/favicon_tab_helper.h" | 19 #include "chrome/browser/favicon/favicon_tab_helper.h" |
19 #include "chrome/browser/history/history_tab_helper.h" | 20 #include "chrome/browser/history/history_tab_helper.h" |
20 #include "chrome/browser/infobars/infobar_tab_helper.h" | 21 #include "chrome/browser/infobars/infobar_tab_helper.h" |
21 #include "chrome/browser/omnibox_search_hint.h" | 22 #include "chrome/browser/omnibox_search_hint.h" |
22 #include "chrome/browser/password_manager/password_manager.h" | 23 #include "chrome/browser/password_manager/password_manager.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 AutofillExternalDelegate::Create(this, autofill_manager_.get())); | 84 AutofillExternalDelegate::Create(this, autofill_manager_.get())); |
84 autofill_manager_->SetExternalDelegate(autofill_external_delegate_.get()); | 85 autofill_manager_->SetExternalDelegate(autofill_external_delegate_.get()); |
85 autocomplete_history_manager_->SetExternalDelegate( | 86 autocomplete_history_manager_->SetExternalDelegate( |
86 autofill_external_delegate_.get()); | 87 autofill_external_delegate_.get()); |
87 } | 88 } |
88 #if defined(ENABLE_AUTOMATION) | 89 #if defined(ENABLE_AUTOMATION) |
89 automation_tab_helper_.reset(new AutomationTabHelper(contents)); | 90 automation_tab_helper_.reset(new AutomationTabHelper(contents)); |
90 #endif | 91 #endif |
91 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this)); | 92 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this)); |
92 bookmark_tab_helper_.reset(new BookmarkTabHelper(this)); | 93 bookmark_tab_helper_.reset(new BookmarkTabHelper(this)); |
94 #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
| |
95 captive_portal_tab_helper_.reset( | |
96 new captive_portal::CaptivePortalTabHelper(profile(), web_contents())); | |
97 #endif | |
93 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this)); | 98 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this)); |
94 core_tab_helper_.reset(new CoreTabHelper(contents)); | 99 core_tab_helper_.reset(new CoreTabHelper(contents)); |
95 extension_tab_helper_.reset(new ExtensionTabHelper(this)); | 100 extension_tab_helper_.reset(new ExtensionTabHelper(this)); |
96 favicon_tab_helper_.reset(new FaviconTabHelper(contents)); | 101 favicon_tab_helper_.reset(new FaviconTabHelper(contents)); |
97 find_tab_helper_.reset(new FindTabHelper(contents)); | 102 find_tab_helper_.reset(new FindTabHelper(contents)); |
98 history_tab_helper_.reset(new HistoryTabHelper(contents)); | 103 history_tab_helper_.reset(new HistoryTabHelper(contents)); |
99 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents)); | 104 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents)); |
100 infobar_tab_helper_.reset(new InfoBarTabHelper(contents)); | 105 infobar_tab_helper_.reset(new InfoBarTabHelper(contents)); |
101 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this)); | 106 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this)); |
102 password_manager_.reset( | 107 password_manager_.reset( |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
206 | 211 |
207 //////////////////////////////////////////////////////////////////////////////// | 212 //////////////////////////////////////////////////////////////////////////////// |
208 // WebContentsObserver overrides | 213 // WebContentsObserver overrides |
209 | 214 |
210 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) { | 215 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) { |
211 // Destruction of the WebContents should only be done by us from our | 216 // Destruction of the WebContents should only be done by us from our |
212 // destructor. Otherwise it's very likely we (or one of the helpers we own) | 217 // destructor. Otherwise it's very likely we (or one of the helpers we own) |
213 // will attempt to access the WebContents and we'll crash. | 218 // will attempt to access the WebContents and we'll crash. |
214 DCHECK(in_destructor_); | 219 DCHECK(in_destructor_); |
215 } | 220 } |
OLD | NEW |