| 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 } | 239 } |
| 240 } | 240 } |
| 241 | 241 |
| 242 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 242 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
| 243 DCHECK(a && b); | 243 DCHECK(a && b); |
| 244 if (a->IsSameProfile(b)) | 244 if (a->IsSameProfile(b)) |
| 245 return false; | 245 return false; |
| 246 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 246 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 247 } | 247 } |
| 248 | 248 |
| 249 sync_preferences::PrefServiceSyncable* Profile::CreateOffTheRecordPrefs( |
| 250 service_manager::Connector* otr_connector) { |
| 251 // TODO(tibell): How do we square this circle? |
| 252 return nullptr; |
| 253 }; |
| 254 |
| 249 double Profile::GetDefaultZoomLevelForProfile() { | 255 double Profile::GetDefaultZoomLevelForProfile() { |
| 250 return GetDefaultStoragePartition(this) | 256 return GetDefaultStoragePartition(this) |
| 251 ->GetHostZoomMap() | 257 ->GetHostZoomMap() |
| 252 ->GetDefaultZoomLevel(); | 258 ->GetDefaultZoomLevel(); |
| 253 } | 259 } |
| OLD | NEW |