OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 mutable scoped_ptr<TransportSecurityPersister> | 307 mutable scoped_ptr<TransportSecurityPersister> |
308 transport_security_persister_; | 308 transport_security_persister_; |
309 | 309 |
310 // These are only valid in between LazyInitialize() and their accessor being | 310 // These are only valid in between LazyInitialize() and their accessor being |
311 // called. | 311 // called. |
312 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_; | 312 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_; |
313 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_; | 313 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_; |
314 // One AppRequestContext per isolated app. | 314 // One AppRequestContext per isolated app. |
315 mutable AppRequestContextMap app_request_context_map_; | 315 mutable AppRequestContextMap app_request_context_map_; |
316 | 316 |
| 317 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 318 bool initialized_on_UI_thread_; |
| 319 |
317 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 320 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
318 }; | 321 }; |
319 | 322 |
320 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 323 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |