| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 DesktopNotificationService* notification_service; | 199 DesktopNotificationService* notification_service; |
| 200 #endif | 200 #endif |
| 201 | 201 |
| 202 // This pointer exists only as a means of conveying a url interceptor | 202 // This pointer exists only as a means of conveying a url interceptor |
| 203 // pointer from the protocol handler registry on the UI thread to the | 203 // pointer from the protocol handler registry on the UI thread to the |
| 204 // the URLRequestJobFactory on the IO thread. The consumer MUST take | 204 // the URLRequestJobFactory on the IO thread. The consumer MUST take |
| 205 // ownership of the object by calling release() on this pointer. | 205 // ownership of the object by calling release() on this pointer. |
| 206 scoped_ptr<net::URLRequestJobFactory::Interceptor> | 206 scoped_ptr<net::URLRequestJobFactory::Interceptor> |
| 207 protocol_handler_interceptor; | 207 protocol_handler_interceptor; |
| 208 | 208 |
| 209 // We need to initialize the ProxyConfigService from the UI thread | 209 // Used on the UI thread to return a pointer to the Profile. |
| 210 // because on linux it relies on initializing things through gconf, | 210 base::Callback<Profile*(void)> profile_getter; |
| 211 // and needs to be on the main thread. | |
| 212 scoped_ptr<net::ProxyConfigService> proxy_config_service; | |
| 213 // The profile this struct was populated from. It's passed as a void* to | 211 // The profile this struct was populated from. It's passed as a void* to |
| 214 // ensure it's not accidently used on the IO thread. Before using it on the | 212 // ensure it's not accidently used on the IO thread. Before using it on the |
| 215 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. | 213 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |
| 216 void* profile; | 214 void* profile; |
| 217 }; | 215 }; |
| 218 | 216 |
| 219 explicit ProfileIOData(bool is_incognito); | 217 explicit ProfileIOData(bool is_incognito); |
| 220 | 218 |
| 221 static std::string GetSSLSessionCacheShard(); | 219 static std::string GetSSLSessionCacheShard(); |
| 222 | 220 |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 | 427 |
| 430 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 428 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 431 bool initialized_on_UI_thread_; | 429 bool initialized_on_UI_thread_; |
| 432 | 430 |
| 433 bool is_incognito_; | 431 bool is_incognito_; |
| 434 | 432 |
| 435 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 433 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 436 }; | 434 }; |
| 437 | 435 |
| 438 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 436 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |