| 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 10 matching lines...) Expand all Loading... |
| 21 #include "components/sync/base/sync_prefs.h" | 21 #include "components/sync/base/sync_prefs.h" |
| 22 #include "content/public/browser/host_zoom_map.h" | 22 #include "content/public/browser/host_zoom_map.h" |
| 23 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
| 24 #include "content/public/browser/notification_source.h" | 24 #include "content/public/browser/notification_source.h" |
| 25 #include "content/public/browser/storage_partition.h" | 25 #include "content/public/browser/storage_partition.h" |
| 26 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
| 27 #include "content/public/browser/web_ui.h" | 27 #include "content/public/browser/web_ui.h" |
| 28 | 28 |
| 29 #if defined(OS_CHROMEOS) | 29 #if defined(OS_CHROMEOS) |
| 30 #include "base/command_line.h" | 30 #include "base/command_line.h" |
| 31 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" |
| 31 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
| 32 #include "chromeos/chromeos_switches.h" | 33 #include "chromeos/chromeos_switches.h" |
| 33 #endif | 34 #endif |
| 34 | 35 |
| 35 #if defined(ENABLE_EXTENSIONS) | 36 #if defined(ENABLE_EXTENSIONS) |
| 36 #include "extensions/browser/pref_names.h" | 37 #include "extensions/browser/pref_names.h" |
| 37 #endif | 38 #endif |
| 38 | 39 |
| 39 Profile::Profile() | 40 Profile::Profile() |
| 40 : restored_last_session_(false), | 41 : restored_last_session_(false), |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 if (a->IsSameProfile(b)) | 240 if (a->IsSameProfile(b)) |
| 240 return false; | 241 return false; |
| 241 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 242 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
| 242 } | 243 } |
| 243 | 244 |
| 244 double Profile::GetDefaultZoomLevelForProfile() { | 245 double Profile::GetDefaultZoomLevelForProfile() { |
| 245 return GetDefaultStoragePartition(this) | 246 return GetDefaultStoragePartition(this) |
| 246 ->GetHostZoomMap() | 247 ->GetHostZoomMap() |
| 247 ->GetDefaultZoomLevel(); | 248 ->GetDefaultZoomLevel(); |
| 248 } | 249 } |
| OLD | NEW |