| 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 #include "chrome/browser/profiles/profile.h" | 5 #include "chrome/browser/profiles/profile.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 #endif | 197 #endif |
| 198 } | 198 } |
| 199 | 199 |
| 200 bool Profile::IsSystemProfile() const { | 200 bool Profile::IsSystemProfile() const { |
| 201 return is_system_profile_; | 201 return is_system_profile_; |
| 202 } | 202 } |
| 203 | 203 |
| 204 bool Profile::IsNewProfile() { | 204 bool Profile::IsNewProfile() { |
| 205 // The profile has been shut down if the prefs were loaded from disk, unless | 205 // The profile has been shut down if the prefs were loaded from disk, unless |
| 206 // first-run autoimport wrote them and reloaded the pref service. | 206 // first-run autoimport wrote them and reloaded the pref service. |
| 207 // TODO(dconnelly): revisit this when crbug.com/22142 (unifying the profile | 207 // TODO(crbug.com/660346): revisit this when crbug.com/22142 (unifying the |
| 208 // import code) is fixed. | 208 // profile import code) is fixed. |
| 209 return GetOriginalProfile()->GetPrefs()->GetInitializationStatus() == | 209 return GetOriginalProfile()->GetPrefs()->GetInitializationStatus() == |
| 210 PrefService::INITIALIZATION_STATUS_CREATED_NEW_PREF_STORE; | 210 PrefService::INITIALIZATION_STATUS_CREATED_NEW_PREF_STORE; |
| 211 } | 211 } |
| 212 | 212 |
| 213 bool Profile::IsSyncAllowed() { | 213 bool Profile::IsSyncAllowed() { |
| 214 if (ProfileSyncServiceFactory::HasProfileSyncService(this)) { | 214 if (ProfileSyncServiceFactory::HasProfileSyncService(this)) { |
| 215 return ProfileSyncServiceFactory::GetForProfile(this)->IsSyncAllowed(); | 215 return ProfileSyncServiceFactory::GetForProfile(this)->IsSyncAllowed(); |
| 216 } | 216 } |
| 217 | 217 |
| 218 // No ProfileSyncService created yet - we don't want to create one, so just | 218 // No ProfileSyncService created yet - we don't want to create one, so just |
| (...skipping 20 matching lines...) Expand all Loading... |
| 239 if (a->IsSameProfile(b)) | 239 if (a->IsSameProfile(b)) |
| 240 return false; | 240 return false; |
| 241 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 241 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 242 } | 242 } |
| 243 | 243 |
| 244 double Profile::GetDefaultZoomLevelForProfile() { | 244 double Profile::GetDefaultZoomLevelForProfile() { |
| 245 return GetDefaultStoragePartition(this) | 245 return GetDefaultStoragePartition(this) |
| 246 ->GetHostZoomMap() | 246 ->GetHostZoomMap() |
| 247 ->GetDefaultZoomLevel(); | 247 ->GetDefaultZoomLevel(); |
| 248 } | 248 } |
| OLD | NEW |