| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 | 376 |
| 377 bool initialized() const { | 377 bool initialized() const { |
| 378 return initialized_; | 378 return initialized_; |
| 379 } | 379 } |
| 380 | 380 |
| 381 // Destroys the ResourceContext first, to cancel any URLRequests that are | 381 // Destroys the ResourceContext first, to cancel any URLRequests that are |
| 382 // using it still, before we destroy the member variables that those | 382 // using it still, before we destroy the member variables that those |
| 383 // URLRequests may be accessing. | 383 // URLRequests may be accessing. |
| 384 void DestroyResourceContext(); | 384 void DestroyResourceContext(); |
| 385 | 385 |
| 386 scoped_ptr<net::HttpNetworkSession> CreateHttpNetworkSession( | 386 // Creates network session and main network transaction factory. |
| 387 const ProfileParams& profile_params) const; | |
| 388 | |
| 389 // Creates main network transaction factory. | |
| 390 scoped_ptr<net::HttpCache> CreateMainHttpFactory( | 387 scoped_ptr<net::HttpCache> CreateMainHttpFactory( |
| 391 net::HttpNetworkSession* session, | 388 const ProfileParams* profile_params, |
| 392 net::HttpCache::BackendFactory* main_backend) const; | 389 net::HttpCache::BackendFactory* main_backend) const; |
| 393 | 390 |
| 394 // Creates network transaction factory. | 391 // Creates network transaction factory. |
| 395 scoped_ptr<net::HttpCache> CreateHttpFactory( | 392 scoped_ptr<net::HttpCache> CreateHttpFactory( |
| 396 net::HttpNetworkSession* shared_session, | 393 net::HttpNetworkSession* shared_session, |
| 397 net::HttpCache::BackendFactory* backend) const; | 394 net::HttpCache::BackendFactory* backend) const; |
| 398 | 395 |
| 399 void SetCookieSettingsForTesting( | 396 void SetCookieSettingsForTesting( |
| 400 content_settings::CookieSettings* cookie_settings); | 397 content_settings::CookieSettings* cookie_settings); |
| 401 | 398 |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 | 597 |
| 601 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 598 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 602 bool initialized_on_UI_thread_; | 599 bool initialized_on_UI_thread_; |
| 603 | 600 |
| 604 const Profile::ProfileType profile_type_; | 601 const Profile::ProfileType profile_type_; |
| 605 | 602 |
| 606 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 603 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 607 }; | 604 }; |
| 608 | 605 |
| 609 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 606 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |