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

Side by Side Diff: net/http/http_network_transaction.cc

Issue 215023002: Rename PrivateMode enum values: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 #include "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 start_time_ = base::Time::Now(); 189 start_time_ = base::Time::Now();
190 190
191 if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) { 191 if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) {
192 server_ssl_config_.rev_checking_enabled = false; 192 server_ssl_config_.rev_checking_enabled = false;
193 proxy_ssl_config_.rev_checking_enabled = false; 193 proxy_ssl_config_.rev_checking_enabled = false;
194 } 194 }
195 195
196 // Channel ID is enabled unless --disable-tls-channel-id flag is set, 196 // Channel ID is enabled unless --disable-tls-channel-id flag is set,
197 // or if privacy mode is enabled. 197 // or if privacy mode is enabled.
198 bool channel_id_enabled = server_ssl_config_.channel_id_enabled && 198 bool channel_id_enabled = server_ssl_config_.channel_id_enabled &&
199 (request_->privacy_mode == kPrivacyModeDisabled); 199 (request_->privacy_mode == PRIVACY_MODE_DISABLED);
200 server_ssl_config_.channel_id_enabled = channel_id_enabled; 200 server_ssl_config_.channel_id_enabled = channel_id_enabled;
201 201
202 next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM; 202 next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM;
203 int rv = DoLoop(OK); 203 int rv = DoLoop(OK);
204 if (rv == ERR_IO_PENDING) 204 if (rv == ERR_IO_PENDING)
205 callback_ = callback; 205 callback_ = callback;
206 return rv; 206 return rv;
207 } 207 }
208 208
209 int HttpNetworkTransaction::RestartIgnoringLastError( 209 int HttpNetworkTransaction::RestartIgnoringLastError(
(...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1600 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1601 state); 1601 state);
1602 break; 1602 break;
1603 } 1603 }
1604 return description; 1604 return description;
1605 } 1605 }
1606 1606
1607 #undef STATE_CASE 1607 #undef STATE_CASE
1608 1608
1609 } // namespace net 1609 } // namespace net
OLDNEW
« no previous file with comments | « net/http/disk_cache_based_quic_server_info_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698