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

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

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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
« no previous file with comments | « net/http/http_server_properties_manager.h ('k') | net/http/http_stream_factory_impl_job.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_server_properties_manager.h" 5 #include "net/http/http_server_properties_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void HttpServerPropertiesManager::SetVersion( 123 void HttpServerPropertiesManager::SetVersion(
124 base::DictionaryValue* http_server_properties_dict, 124 base::DictionaryValue* http_server_properties_dict,
125 int version_number) { 125 int version_number) {
126 if (version_number < 0) 126 if (version_number < 0)
127 version_number = kVersionNumber; 127 version_number = kVersionNumber;
128 DCHECK_LE(version_number, kVersionNumber); 128 DCHECK_LE(version_number, kVersionNumber);
129 if (version_number <= kVersionNumber) 129 if (version_number <= kVersionNumber)
130 http_server_properties_dict->SetInteger(kVersionKey, version_number); 130 http_server_properties_dict->SetInteger(kVersionKey, version_number);
131 } 131 }
132 132
133 // This is required for conformance with the HttpServerProperties interface.
134 base::WeakPtr<HttpServerProperties> HttpServerPropertiesManager::GetWeakPtr() {
135 DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
136 return network_weak_ptr_factory_->GetWeakPtr();
137 }
138
139 void HttpServerPropertiesManager::Clear() { 133 void HttpServerPropertiesManager::Clear() {
140 Clear(base::Closure()); 134 Clear(base::Closure());
141 } 135 }
142 136
143 void HttpServerPropertiesManager::Clear(const base::Closure& completion) { 137 void HttpServerPropertiesManager::Clear(const base::Closure& completion) {
144 DCHECK(network_task_runner_->RunsTasksOnCurrentThread()); 138 DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
145 139
146 http_server_properties_impl_->Clear(); 140 http_server_properties_impl_->Clear();
147 UpdatePrefsFromCacheOnNetworkThread(completion); 141 UpdatePrefsFromCacheOnNetworkThread(completion);
148 } 142 }
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 quic_servers_dict); 1246 quic_servers_dict);
1253 } 1247 }
1254 1248
1255 void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() { 1249 void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() {
1256 DCHECK(pref_task_runner_->RunsTasksOnCurrentThread()); 1250 DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
1257 if (!setting_prefs_) 1251 if (!setting_prefs_)
1258 ScheduleUpdateCacheOnPrefThread(); 1252 ScheduleUpdateCacheOnPrefThread();
1259 } 1253 }
1260 1254
1261 } // namespace net 1255 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_server_properties_manager.h ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698