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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1485 FillFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap, | 1485 FillFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap, |
1486 &web_prefs->fixed_font_family_map); | 1486 &web_prefs->fixed_font_family_map); |
1487 FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap, | 1487 FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap, |
1488 &web_prefs->serif_font_family_map); | 1488 &web_prefs->serif_font_family_map); |
1489 FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap, | 1489 FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap, |
1490 &web_prefs->sans_serif_font_family_map); | 1490 &web_prefs->sans_serif_font_family_map); |
1491 FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap, | 1491 FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap, |
1492 &web_prefs->cursive_font_family_map); | 1492 &web_prefs->cursive_font_family_map); |
1493 FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap, | 1493 FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap, |
1494 &web_prefs->fantasy_font_family_map); | 1494 &web_prefs->fantasy_font_family_map); |
| 1495 FillFontFamilyMap(prefs, prefs::kWebKitPictographFontFamilyMap, |
| 1496 &web_prefs->pictograph_font_family_map); |
1495 | 1497 |
1496 web_prefs->default_font_size = | 1498 web_prefs->default_font_size = |
1497 prefs->GetInteger(prefs::kWebKitDefaultFontSize); | 1499 prefs->GetInteger(prefs::kWebKitDefaultFontSize); |
1498 web_prefs->default_fixed_font_size = | 1500 web_prefs->default_fixed_font_size = |
1499 prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize); | 1501 prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize); |
1500 web_prefs->minimum_font_size = | 1502 web_prefs->minimum_font_size = |
1501 prefs->GetInteger(prefs::kWebKitMinimumFontSize); | 1503 prefs->GetInteger(prefs::kWebKitMinimumFontSize); |
1502 web_prefs->minimum_logical_font_size = | 1504 web_prefs->minimum_logical_font_size = |
1503 prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize); | 1505 prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize); |
1504 | 1506 |
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1837 partition_id = extension->id(); | 1839 partition_id = extension->id(); |
1838 } | 1840 } |
1839 | 1841 |
1840 // Enforce that IsValidStoragePartitionId() implementation stays in sync. | 1842 // Enforce that IsValidStoragePartitionId() implementation stays in sync. |
1841 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); | 1843 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); |
1842 return partition_id; | 1844 return partition_id; |
1843 } | 1845 } |
1844 | 1846 |
1845 | 1847 |
1846 } // namespace chrome | 1848 } // namespace chrome |
OLD | NEW |