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

Side by Side Diff: net/http/http_auth_controller.h

Issue 10916272: Remove HttpAuth::Scheme enum in favor of a string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « net/http/http_auth_cache_unittest.cc ('k') | net/http/http_auth_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 NET_HTTP_HTTP_AUTH_CONTROLLER_H_ 5 #ifndef NET_HTTP_HTTP_AUTH_CONTROLLER_H_
6 #define NET_HTTP_HTTP_AUTH_CONTROLLER_H_ 6 #define NET_HTTP_HTTP_AUTH_CONTROLLER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 // Store the supplied credentials and prepare to restart the auth. 63 // Store the supplied credentials and prepare to restart the auth.
64 virtual void ResetAuth(const AuthCredentials& credentials); 64 virtual void ResetAuth(const AuthCredentials& credentials);
65 65
66 virtual bool HaveAuthHandler() const; 66 virtual bool HaveAuthHandler() const;
67 67
68 virtual bool HaveAuth() const; 68 virtual bool HaveAuth() const;
69 69
70 virtual scoped_refptr<AuthChallengeInfo> auth_info(); 70 virtual scoped_refptr<AuthChallengeInfo> auth_info();
71 71
72 virtual bool IsAuthSchemeDisabled(HttpAuth::Scheme scheme) const; 72 virtual bool IsAuthSchemeDisabled(const std::string& scheme) const;
73 virtual void DisableAuthScheme(HttpAuth::Scheme scheme); 73 virtual void DisableAuthScheme(const std::string& scheme);
74 74
75 private: 75 private:
76 // Actions for InvalidateCurrentHandler() 76 // Actions for InvalidateCurrentHandler()
77 enum InvalidateHandlerAction { 77 enum InvalidateHandlerAction {
78 INVALIDATE_HANDLER_AND_CACHED_CREDENTIALS, 78 INVALIDATE_HANDLER_AND_CACHED_CREDENTIALS,
79 INVALIDATE_HANDLER_AND_DISABLE_SCHEME, 79 INVALIDATE_HANDLER_AND_DISABLE_SCHEME,
80 INVALIDATE_HANDLER 80 INVALIDATE_HANDLER
81 }; 81 };
82 82
83 // So that we can mock this object. 83 // So that we can mock this object.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // True if default credentials have already been tried for this transaction 153 // True if default credentials have already been tried for this transaction
154 // in response to an HTTP authentication challenge. 154 // in response to an HTTP authentication challenge.
155 bool default_credentials_used_; 155 bool default_credentials_used_;
156 156
157 // These two are owned by the HttpNetworkSession/IOThread, which own the 157 // These two are owned by the HttpNetworkSession/IOThread, which own the
158 // objects which reference |this|. Therefore, these raw pointers are valid 158 // objects which reference |this|. Therefore, these raw pointers are valid
159 // for the lifetime of this object. 159 // for the lifetime of this object.
160 HttpAuthCache* const http_auth_cache_; 160 HttpAuthCache* const http_auth_cache_;
161 HttpAuthHandlerFactory* const http_auth_handler_factory_; 161 HttpAuthHandlerFactory* const http_auth_handler_factory_;
162 162
163 std::set<HttpAuth::Scheme> disabled_schemes_; 163 std::set<std::string> disabled_schemes_;
164 164
165 CompletionCallback callback_; 165 CompletionCallback callback_;
166 }; 166 };
167 167
168 } // namespace net 168 } // namespace net
169 169
170 #endif // NET_HTTP_HTTP_AUTH_CONTROLLER_H_ 170 #endif // NET_HTTP_HTTP_AUTH_CONTROLLER_H_
OLDNEW
« no previous file with comments | « net/http/http_auth_cache_unittest.cc ('k') | net/http/http_auth_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698