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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_tab_helper.h

Issue 10967003: Add desktop type context to most existing instances of FindTabbedBrowser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moving check_deps exception to specific_include_rules after chat with Kai. Created 8 years, 2 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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/threading/non_thread_safe.h" 11 #include "base/threading/non_thread_safe.h"
12 #include "chrome/browser/captive_portal/captive_portal_service.h" 12 #include "chrome/browser/captive_portal/captive_portal_service.h"
13 #include "chrome/browser/common/web_contents_user_data.h" 13 #include "chrome/browser/common/web_contents_user_data.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
16 #include "content/public/browser/web_contents_observer.h" 16 #include "content/public/browser/web_contents_observer.h"
17 #include "webkit/glue/resource_type.h" 17 #include "webkit/glue/resource_type.h"
18 18
19 class GURL; 19 class GURL;
20 class Profile; 20 class Profile;
21 21
22 namespace content {
23 class WebContents;
24 }
25
22 namespace net { 26 namespace net {
23 class SSLInfo; 27 class SSLInfo;
24 } 28 }
25 29
26 namespace captive_portal { 30 namespace captive_portal {
27 31
28 class CaptivePortalLoginDetector; 32 class CaptivePortalLoginDetector;
29 class CaptivePortalTabReloader; 33 class CaptivePortalTabReloader;
30 34
31 // Along with the classes it owns, responsible for detecting page loads broken 35 // Along with the classes it owns, responsible for detecting page loads broken
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 135
132 // Opens a login tab if the profile's active window doesn't have one already. 136 // Opens a login tab if the profile's active window doesn't have one already.
133 void OpenLoginTab(); 137 void OpenLoginTab();
134 138
135 Profile* profile_; 139 Profile* profile_;
136 140
137 // Neither of these will ever be NULL. 141 // Neither of these will ever be NULL.
138 scoped_ptr<CaptivePortalTabReloader> tab_reloader_; 142 scoped_ptr<CaptivePortalTabReloader> tab_reloader_;
139 scoped_ptr<CaptivePortalLoginDetector> login_detector_; 143 scoped_ptr<CaptivePortalLoginDetector> login_detector_;
140 144
145 content::WebContents* web_contents_;
146
141 // If a provisional load has failed, and the tab is loading an error page, the 147 // If a provisional load has failed, and the tab is loading an error page, the
142 // error code associated with the error page we're loading. 148 // error code associated with the error page we're loading.
143 // net::OK, otherwise. 149 // net::OK, otherwise.
144 int pending_error_code_; 150 int pending_error_code_;
145 151
146 // The RenderViewHost with a provisional load, if any. Can either be 152 // The RenderViewHost with a provisional load, if any. Can either be
147 // the currently displayed RenderViewHost or a pending RenderViewHost for 153 // the currently displayed RenderViewHost or a pending RenderViewHost for
148 // cross-process navitations. NULL when there's currently no provisional 154 // cross-process navitations. NULL when there's currently no provisional
149 // load. 155 // load.
150 content::RenderViewHost* provisional_render_view_host_; 156 content::RenderViewHost* provisional_render_view_host_;
151 157
152 content::NotificationRegistrar registrar_; 158 content::NotificationRegistrar registrar_;
153 159
154 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper); 160 DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
155 }; 161 };
156 162
157 } // namespace captive_portal 163 } // namespace captive_portal
158 164
159 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_ 165 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698