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

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: 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
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void HttpServerPropertiesManager::SetVersion( 121 void HttpServerPropertiesManager::SetVersion(
122 base::DictionaryValue* http_server_properties_dict, 122 base::DictionaryValue* http_server_properties_dict,
123 int version_number) { 123 int version_number) {
124 if (version_number < 0) 124 if (version_number < 0)
125 version_number = kVersionNumber; 125 version_number = kVersionNumber;
126 DCHECK_LE(version_number, kVersionNumber); 126 DCHECK_LE(version_number, kVersionNumber);
127 if (version_number <= kVersionNumber) 127 if (version_number <= kVersionNumber)
128 http_server_properties_dict->SetInteger(kVersionKey, version_number); 128 http_server_properties_dict->SetInteger(kVersionKey, version_number);
129 } 129 }
130 130
131 // This is required for conformance with the HttpServerProperties interface.
132 base::WeakPtr<HttpServerProperties> HttpServerPropertiesManager::GetWeakPtr() {
133 DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
134 return network_weak_ptr_factory_->GetWeakPtr();
135 }
136
137 void HttpServerPropertiesManager::Clear() { 131 void HttpServerPropertiesManager::Clear() {
138 Clear(base::Closure()); 132 Clear(base::Closure());
139 } 133 }
140 134
141 void HttpServerPropertiesManager::Clear(const base::Closure& completion) { 135 void HttpServerPropertiesManager::Clear(const base::Closure& completion) {
142 DCHECK(network_task_runner_->RunsTasksOnCurrentThread()); 136 DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
143 137
144 http_server_properties_impl_->Clear(); 138 http_server_properties_impl_->Clear();
145 UpdatePrefsFromCacheOnNetworkThread(completion); 139 UpdatePrefsFromCacheOnNetworkThread(completion);
146 } 140 }
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 quic_servers_dict); 1256 quic_servers_dict);
1263 } 1257 }
1264 1258
1265 void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() { 1259 void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() {
1266 DCHECK(pref_task_runner_->RunsTasksOnCurrentThread()); 1260 DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
1267 if (!setting_prefs_) 1261 if (!setting_prefs_)
1268 ScheduleUpdateCacheOnPrefThread(); 1262 ScheduleUpdateCacheOnPrefThread();
1269 } 1263 }
1270 1264
1271 } // namespace net 1265 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698