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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state_io_data.h

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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_ 5 #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_
6 #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_ 6 #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 void ShutdownOnUIThread( 196 void ShutdownOnUIThread(
197 std::unique_ptr<IOSChromeURLRequestContextGetterVector> context_getters); 197 std::unique_ptr<IOSChromeURLRequestContextGetterVector> context_getters);
198 198
199 // A ChannelIDService object is created by a derived class of 199 // A ChannelIDService object is created by a derived class of
200 // ChromeBrowserStateIOData, and the derived class calls this method to set 200 // ChromeBrowserStateIOData, and the derived class calls this method to set
201 // the channel_id_service_ member and transfers ownership to the base class. 201 // the channel_id_service_ member and transfers ownership to the base class.
202 void set_channel_id_service(net::ChannelIDService* channel_id_service) const; 202 void set_channel_id_service(net::ChannelIDService* channel_id_service) const;
203 203
204 net::ProxyService* proxy_service() const { return proxy_service_.get(); } 204 net::ProxyService* proxy_service() const { return proxy_service_.get(); }
205 205
206 base::WeakPtr<net::HttpServerProperties> http_server_properties() const; 206 net::HttpServerProperties* http_server_properties() const;
207 207
208 void set_http_server_properties( 208 void set_http_server_properties(
209 std::unique_ptr<net::HttpServerProperties> http_server_properties) const; 209 std::unique_ptr<net::HttpServerProperties> http_server_properties) const;
210 210
211 net::URLRequestContext* main_request_context() const { 211 net::URLRequestContext* main_request_context() const {
212 return main_request_context_.get(); 212 return main_request_context_.get();
213 } 213 }
214 214
215 bool initialized() const { return initialized_; } 215 bool initialized() const { return initialized_; }
216 216
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 305
306 mutable std::unique_ptr<IOSChromeHttpUserAgentSettings> 306 mutable std::unique_ptr<IOSChromeHttpUserAgentSettings>
307 chrome_http_user_agent_settings_; 307 chrome_http_user_agent_settings_;
308 308
309 const ios::ChromeBrowserStateType browser_state_type_; 309 const ios::ChromeBrowserStateType browser_state_type_;
310 310
311 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserStateIOData); 311 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserStateIOData);
312 }; 312 };
313 313
314 #endif // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_ 314 #endif // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_
OLDNEW
« no previous file with comments | « google_apis/gcm/tools/mcs_probe.cc ('k') | ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698