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

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

Issue 10412050: Change most content::URLFetcher references to net::URLFetcher (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ChromeOS, address comments Created 8 years, 7 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_SERVICE_H_ 5 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_ 6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void ResetBackoffEntry(Result result); 136 void ResetBackoffEntry(Result result);
137 137
138 // Updates |enabled_| based on command line flags and Profile preferences, 138 // Updates |enabled_| based on command line flags and Profile preferences,
139 // and sets |state_| to STATE_NONE if it's false. 139 // and sets |state_| to STATE_NONE if it's false.
140 // TODO(mmenke): Figure out on which platforms, if any, should not use 140 // TODO(mmenke): Figure out on which platforms, if any, should not use
141 // automatic captive portal detection. Currently it's enabled 141 // automatic captive portal detection. Currently it's enabled
142 // on all platforms, though this code is not compiled on 142 // on all platforms, though this code is not compiled on
143 // Android, since it lacks the Browser class. 143 // Android, since it lacks the Browser class.
144 void UpdateEnabledState(); 144 void UpdateEnabledState();
145 145
146 // Takes a content::URLFetcher that has finished trying to retrieve the test 146 // Takes a net::URLFetcher that has finished trying to retrieve the test
147 // URL, and returns a captive_portal::Result based on its result. 147 // URL, and returns a captive_portal::Result based on its result.
148 // If the response is a 503 with a Retry-After header, |retry_after| is 148 // If the response is a 503 with a Retry-After header, |retry_after| is
149 // populated accordingly. Otherwise, it's set to base::TimeDelta(). 149 // populated accordingly. Otherwise, it's set to base::TimeDelta().
150 Result GetCaptivePortalResultFromResponse(const net::URLFetcher* url_fetcher, 150 Result GetCaptivePortalResultFromResponse(const net::URLFetcher* url_fetcher,
151 base::TimeDelta* retry_after) const; 151 base::TimeDelta* retry_after) const;
152 152
153 // Returns the current time. Used only when determining time until a 153 // Returns the current time. Used only when determining time until a
154 // Retry-After date. Overridden by unit tests. 154 // Retry-After date. Overridden by unit tests.
155 virtual base::Time GetCurrentTime() const; 155 virtual base::Time GetCurrentTime() const;
156 156
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 BooleanPrefMember resolve_errors_with_web_service_; 208 BooleanPrefMember resolve_errors_with_web_service_;
209 209
210 base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_; 210 base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;
211 211
212 DISALLOW_COPY_AND_ASSIGN(CaptivePortalService); 212 DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
213 }; 213 };
214 214
215 } // namespace captive_portal 215 } // namespace captive_portal
216 216
217 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_ 217 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/autofill/autofill_download.cc ('k') | chrome/browser/captive_portal/captive_portal_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698