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 "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/first_run/first_run.h" | 12 #include "chrome/browser/first_run/first_run.h" |
13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
14 #include "chrome/browser/sync/profile_sync_service.h" | 14 #include "chrome/browser/sync/profile_sync_service.h" |
15 #include "chrome/browser/sync/profile_sync_service_factory.h" | 15 #include "chrome/browser/sync/profile_sync_service_factory.h" |
16 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" | 17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" |
18 #include "components/pref_registry/pref_registry_syncable.h" | 18 #include "components/pref_registry/pref_registry_syncable.h" |
19 #include "components/sync_driver/sync_prefs.h" | 19 #include "components/sync_driver/sync_prefs.h" |
| 20 #include "content/public/browser/host_zoom_map.h" |
20 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
21 #include "content/public/browser/notification_source.h" | 22 #include "content/public/browser/notification_source.h" |
| 23 #include "content/public/browser/storage_partition.h" |
22 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
23 #include "content/public/browser/web_ui.h" | 25 #include "content/public/browser/web_ui.h" |
24 | 26 |
25 #if defined(OS_CHROMEOS) | 27 #if defined(OS_CHROMEOS) |
26 #include "base/command_line.h" | 28 #include "base/command_line.h" |
27 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
28 #include "chromeos/chromeos_switches.h" | 30 #include "chromeos/chromeos_switches.h" |
29 #endif | 31 #endif |
30 | 32 |
31 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING) | 33 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING) |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 content::NotificationService::NoDetails()); | 262 content::NotificationService::NoDetails()); |
261 } | 263 } |
262 } | 264 } |
263 | 265 |
264 bool ProfileCompare::operator()(Profile* a, Profile* b) const { | 266 bool ProfileCompare::operator()(Profile* a, Profile* b) const { |
265 DCHECK(a && b); | 267 DCHECK(a && b); |
266 if (a->IsSameProfile(b)) | 268 if (a->IsSameProfile(b)) |
267 return false; | 269 return false; |
268 return a->GetOriginalProfile() < b->GetOriginalProfile(); | 270 return a->GetOriginalProfile() < b->GetOriginalProfile(); |
269 } | 271 } |
| 272 |
| 273 double Profile::GetDefaultZoomLevelForProfile() { |
| 274 return GetDefaultStoragePartition(this) |
| 275 ->GetHostZoomMap() |
| 276 ->GetDefaultZoomLevel(); |
| 277 } |
OLD | NEW |