| 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" | 
|   11 #include "base/callback_forward.h" |   11 #include "base/callback_forward.h" | 
|   12 #include "base/file_path.h" |   12 #include "base/file_path.h" | 
|   13 #include "base/memory/ref_counted.h" |   13 #include "base/memory/ref_counted.h" | 
|   14 #include "base/memory/scoped_ptr.h" |   14 #include "base/memory/scoped_ptr.h" | 
|   15 #include "base/memory/weak_ptr.h" |   15 #include "base/memory/weak_ptr.h" | 
|   16 #include "base/synchronization/lock.h" |   16 #include "base/synchronization/lock.h" | 
|   17 #include "chrome/browser/net/chrome_url_request_context.h" |   17 #include "chrome/browser/net/chrome_url_request_context.h" | 
|   18 #include "chrome/browser/prefs/pref_member.h" |   18 #include "chrome/browser/prefs/pref_member.h" | 
|   19 #include "content/public/browser/resource_context.h" |   19 #include "content/public/browser/resource_context.h" | 
|   20 #include "net/cookies/cookie_monster.h" |   20 #include "net/cookies/cookie_monster.h" | 
 |   21 #include "net/url_request/url_request_job_factory.h" | 
|   21  |   22  | 
|   22 class CookieSettings; |   23 class CookieSettings; | 
|   23 class DesktopNotificationService; |   24 class DesktopNotificationService; | 
|   24 class ExtensionInfoMap; |   25 class ExtensionInfoMap; | 
|   25 class HostContentSettingsMap; |   26 class HostContentSettingsMap; | 
|   26 class IOThread; |   27 class IOThread; | 
|   27 class Profile; |   28 class Profile; | 
|   28 class ProtocolHandlerRegistry; |   29 class ProtocolHandlerRegistry; | 
|   29 class TransportSecurityPersister; |   30 class TransportSecurityPersister; | 
|   30  |   31  | 
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  158     scoped_refptr<net::SSLConfigService> ssl_config_service; |  159     scoped_refptr<net::SSLConfigService> ssl_config_service; | 
|  159     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; |  160     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; | 
|  160     scoped_refptr<ExtensionInfoMap> extension_info_map; |  161     scoped_refptr<ExtensionInfoMap> extension_info_map; | 
|  161     scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver> |  162     scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver> | 
|  162         resource_prefetch_predictor_observer_; |  163         resource_prefetch_predictor_observer_; | 
|  163  |  164  | 
|  164 #if defined(ENABLE_NOTIFICATIONS) |  165 #if defined(ENABLE_NOTIFICATIONS) | 
|  165     DesktopNotificationService* notification_service; |  166     DesktopNotificationService* notification_service; | 
|  166 #endif |  167 #endif | 
|  167  |  168  | 
|  168     scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry; |  169     // This pointer exists only as a means of conveying a url interceptor | 
 |  170     // pointer from the protocol handler registry on the UI thread to the | 
 |  171     // the URLRequestJobFactory on the IO thread. The consumer MUST take | 
 |  172     // ownership of the object by calling release() on this pointer. | 
 |  173     scoped_ptr<net::URLRequestJobFactory::Interceptor> | 
 |  174         protocol_handler_url_interceptor; | 
 |  175  | 
|  169     // We need to initialize the ProxyConfigService from the UI thread |  176     // We need to initialize the ProxyConfigService from the UI thread | 
|  170     // because on linux it relies on initializing things through gconf, |  177     // because on linux it relies on initializing things through gconf, | 
|  171     // and needs to be on the main thread. |  178     // and needs to be on the main thread. | 
|  172     scoped_ptr<net::ProxyConfigService> proxy_config_service; |  179     scoped_ptr<net::ProxyConfigService> proxy_config_service; | 
|  173     // The profile this struct was populated from. It's passed as a void* to |  180     // The profile this struct was populated from. It's passed as a void* to | 
|  174     // ensure it's not accidently used on the IO thread. Before using it on the |  181     // ensure it's not accidently used on the IO thread. Before using it on the | 
|  175     // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |  182     // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. | 
|  176     void* profile; |  183     void* profile; | 
|  177   }; |  184   }; | 
|  178  |  185  | 
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  354  |  361  | 
|  355   // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |  362   // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 
|  356   bool initialized_on_UI_thread_; |  363   bool initialized_on_UI_thread_; | 
|  357  |  364  | 
|  358   bool is_incognito_; |  365   bool is_incognito_; | 
|  359  |  366  | 
|  360   DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |  367   DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 
|  361 }; |  368 }; | 
|  362  |  369  | 
|  363 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |  370 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 
| OLD | NEW |