| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 ChromeZoomLevelPrefs* Profile::GetZoomLevelPrefs() { | 66 ChromeZoomLevelPrefs* Profile::GetZoomLevelPrefs() { |
| 67 return NULL; | 67 return NULL; |
| 68 } | 68 } |
| 69 | 69 |
| 70 Profile::Delegate::~Delegate() { | 70 Profile::Delegate::~Delegate() { |
| 71 } | 71 } |
| 72 | 72 |
| 73 // static | 73 // static |
| 74 const char Profile::kProfileKey[] = "__PROFILE__"; | 74 const char Profile::kProfileKey[] = "__PROFILE__"; |
| 75 // static |
| 76 const char Profile::kThemeProfileKey[] = "__THEME_PROFILE__"; |
| 75 // This must be a string which can never be a valid domain. | 77 // This must be a string which can never be a valid domain. |
| 76 const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN"; | 78 const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN"; |
| 77 | 79 |
| 78 // static | 80 // static |
| 79 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 81 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 80 registry->RegisterBooleanPref( | 82 registry->RegisterBooleanPref( |
| 81 prefs::kSearchSuggestEnabled, | 83 prefs::kSearchSuggestEnabled, |
| 82 true, | 84 true, |
| 83 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 85 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 84 #if defined(OS_ANDROID) | 86 #if defined(OS_ANDROID) |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 if (a->IsSameProfile(b)) | 244 if (a->IsSameProfile(b)) |
| 243 return false; | 245 return false; |
| 244 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 246 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 245 } | 247 } |
| 246 | 248 |
| 247 double Profile::GetDefaultZoomLevelForProfile() { | 249 double Profile::GetDefaultZoomLevelForProfile() { |
| 248 return GetDefaultStoragePartition(this) | 250 return GetDefaultStoragePartition(this) |
| 249 ->GetHostZoomMap() | 251 ->GetHostZoomMap() |
| 250 ->GetDefaultZoomLevel(); | 252 ->GetDefaultZoomLevel(); |
| 251 } | 253 } |
| OLD | NEW |