Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.h

Issue 10020051: Open a login tab on captive portal detection on SSL loads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 class WebIntentPickerController; 51 class WebIntentPickerController;
52 52
53 #if defined(ENABLE_ONE_CLICK_SIGNIN) 53 #if defined(ENABLE_ONE_CLICK_SIGNIN)
54 class OneClickSigninHelper; 54 class OneClickSigninHelper;
55 #endif 55 #endif
56 56
57 namespace browser_sync { 57 namespace browser_sync {
58 class SyncedTabDelegate; 58 class SyncedTabDelegate;
59 } 59 }
60 60
61 namespace captive_portal {
62 class CaptivePortalTabHelper;
63 }
64
61 namespace extensions { 65 namespace extensions {
62 class WebNavigationTabObserver; 66 class WebNavigationTabObserver;
63 } 67 }
64 68
65 namespace prerender { 69 namespace prerender {
66 class PrerenderTabHelper; 70 class PrerenderTabHelper;
67 } 71 }
68 72
69 namespace printing { 73 namespace printing {
70 class PrintViewManager; 74 class PrintViewManager;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 128 }
125 129
126 BlockedContentTabHelper* blocked_content_tab_helper() { 130 BlockedContentTabHelper* blocked_content_tab_helper() {
127 return blocked_content_tab_helper_.get(); 131 return blocked_content_tab_helper_.get();
128 } 132 }
129 133
130 BookmarkTabHelper* bookmark_tab_helper() { 134 BookmarkTabHelper* bookmark_tab_helper() {
131 return bookmark_tab_helper_.get(); 135 return bookmark_tab_helper_.get();
132 } 136 }
133 137
138 #if !defined(OS_ANDROID)
139 captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper() {
140 return captive_portal_tab_helper_.get();
141 }
142 #endif
143
134 ConstrainedWindowTabHelper* constrained_window_tab_helper() { 144 ConstrainedWindowTabHelper* constrained_window_tab_helper() {
135 return constrained_window_tab_helper_.get(); 145 return constrained_window_tab_helper_.get();
136 } 146 }
137 147
138 CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); } 148 CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
139 149
140 ExtensionTabHelper* extension_tab_helper() { 150 ExtensionTabHelper* extension_tab_helper() {
141 return extension_tab_helper_.get(); 151 return extension_tab_helper_.get();
142 } 152 }
143 153
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // Tab Helpers --------------------------------------------------------------- 226 // Tab Helpers ---------------------------------------------------------------
217 // (These provide API for callers and have a getter function listed in the 227 // (These provide API for callers and have a getter function listed in the
218 // "Tab Helpers" section in the member functions area, above.) 228 // "Tab Helpers" section in the member functions area, above.)
219 229
220 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; 230 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
221 scoped_refptr<AutofillManager> autofill_manager_; 231 scoped_refptr<AutofillManager> autofill_manager_;
222 scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_; 232 scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
223 scoped_ptr<AutomationTabHelper> automation_tab_helper_; 233 scoped_ptr<AutomationTabHelper> automation_tab_helper_;
224 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_; 234 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
225 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_; 235 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
236 #if !defined(OS_ANDROID)
237 scoped_ptr<captive_portal::CaptivePortalTabHelper> captive_portal_tab_helper_;
238 #endif
226 scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_; 239 scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
227 scoped_ptr<CoreTabHelper> core_tab_helper_; 240 scoped_ptr<CoreTabHelper> core_tab_helper_;
228 scoped_ptr<ExtensionTabHelper> extension_tab_helper_; 241 scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
229 scoped_ptr<FaviconTabHelper> favicon_tab_helper_; 242 scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
230 scoped_ptr<FindTabHelper> find_tab_helper_; 243 scoped_ptr<FindTabHelper> find_tab_helper_;
231 scoped_ptr<HistoryTabHelper> history_tab_helper_; 244 scoped_ptr<HistoryTabHelper> history_tab_helper_;
232 scoped_ptr<InfoBarTabHelper> infobar_tab_helper_; 245 scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
233 246
234 // PasswordManager and its delegate. The delegate must outlive the manager, 247 // PasswordManager and its delegate. The delegate must outlive the manager,
235 // per documentation in password_manager.h. 248 // per documentation in password_manager.h.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 297
285 // The supporting objects need to outlive the WebContents dtor (as they may 298 // The supporting objects need to outlive the WebContents dtor (as they may
286 // be called upon during its execution). As a result, this must come last 299 // be called upon during its execution). As a result, this must come last
287 // in the list. 300 // in the list.
288 scoped_ptr<content::WebContents> web_contents_; 301 scoped_ptr<content::WebContents> web_contents_;
289 302
290 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); 303 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
291 }; 304 };
292 305
293 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 306 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698