| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "chrome/browser/profile.h" | 5 #include "chrome/browser/profile.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/lock.h" | 9 #include "base/lock.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
| 34 #include "chrome/common/pref_service.h" | 34 #include "chrome/common/pref_service.h" |
| 35 #include "chrome/common/resource_bundle.h" | 35 #include "chrome/common/resource_bundle.h" |
| 36 #include "net/base/cookie_monster.h" | 36 #include "net/base/cookie_monster.h" |
| 37 #include "net/base/cookie_policy.h" | 37 #include "net/base/cookie_policy.h" |
| 38 #include "net/http/http_cache.h" | 38 #include "net/http/http_cache.h" |
| 39 #include "net/proxy/proxy_service.h" | 39 #include "net/proxy/proxy_service.h" |
| 40 #include "net/url_request/url_request_context.h" | 40 #include "net/url_request/url_request_context.h" |
| 41 #include "webkit/glue/webkit_glue.h" | 41 #include "webkit/glue/webkit_glue.h" |
| 42 | 42 |
| 43 using base::Time; |
| 44 using base::TimeDelta; |
| 45 |
| 43 // Delay, in milliseconds, before we explicitly create the SessionService. | 46 // Delay, in milliseconds, before we explicitly create the SessionService. |
| 44 static const int kCreateSessionServiceDelayMS = 500; | 47 static const int kCreateSessionServiceDelayMS = 500; |
| 45 | 48 |
| 46 // A pointer to the request context for the default profile. See comments on | 49 // A pointer to the request context for the default profile. See comments on |
| 47 // Profile::GetDefaultRequestContext. | 50 // Profile::GetDefaultRequestContext. |
| 48 URLRequestContext* Profile::default_request_context_; | 51 URLRequestContext* Profile::default_request_context_; |
| 49 | 52 |
| 50 //static | 53 //static |
| 51 void Profile::RegisterUserPrefs(PrefService* prefs) { | 54 void Profile::RegisterUserPrefs(PrefService* prefs) { |
| 52 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true); | 55 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true); |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 933 } | 936 } |
| 934 | 937 |
| 935 #ifdef CHROME_PERSONALIZATION | 938 #ifdef CHROME_PERSONALIZATION |
| 936 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { | 939 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { |
| 937 if (!personalization_.get()) | 940 if (!personalization_.get()) |
| 938 personalization_.reset( | 941 personalization_.reset( |
| 939 Personalization::CreateProfilePersonalization(this)); | 942 Personalization::CreateProfilePersonalization(this)); |
| 940 return personalization_.get(); | 943 return personalization_.get(); |
| 941 } | 944 } |
| 942 #endif | 945 #endif |
| OLD | NEW |