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/ui/prefs/prefs_tab_helper.h" | 5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/prefs/overlay_user_pref_store.h" | 10 #include "chrome/browser/prefs/overlay_user_pref_store.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
24 #include "grit/locale_settings.h" | 24 #include "grit/locale_settings.h" |
25 #include "grit/platform_locale_settings.h" | 25 #include "grit/platform_locale_settings.h" |
26 #include "webkit/glue/webpreferences.h" | 26 #include "webkit/glue/webpreferences.h" |
27 | 27 |
28 using content::WebContents; | 28 using content::WebContents; |
29 using webkit_glue::WebPreferences; | 29 using webkit_glue::WebPreferences; |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 static void RegisterFontsAndCharsetPrefs(PrefService* prefs) { | 33 // Registers prefs only used for migration. |
34 WebPreferences pref_defaults; | 34 static void RegisterPrefsToMigrate(PrefService* prefs) { |
35 | |
36 prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset, | |
37 IDS_DEFAULT_ENCODING, | |
38 PrefService::SYNCABLE_PREF); | |
39 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize, | |
40 IDS_DEFAULT_FONT_SIZE, | |
41 PrefService::UNSYNCABLE_PREF); | |
42 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFixedFontSize, | |
43 IDS_DEFAULT_FIXED_FONT_SIZE, | |
44 PrefService::UNSYNCABLE_PREF); | |
45 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumFontSize, | |
46 IDS_MINIMUM_FONT_SIZE, | |
47 PrefService::UNSYNCABLE_PREF); | |
48 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumLogicalFontSize, | |
49 IDS_MINIMUM_LOGICAL_FONT_SIZE, | |
50 PrefService::UNSYNCABLE_PREF); | |
51 | |
52 // These are only registered to be used in migration. | |
53 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldStandardFontFamily, | 35 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldStandardFontFamily, |
54 IDS_STANDARD_FONT_FAMILY, | 36 IDS_STANDARD_FONT_FAMILY, |
55 PrefService::UNSYNCABLE_PREF); | 37 PrefService::UNSYNCABLE_PREF); |
56 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFixedFontFamily, | 38 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFixedFontFamily, |
57 IDS_FIXED_FONT_FAMILY, | 39 IDS_FIXED_FONT_FAMILY, |
58 PrefService::UNSYNCABLE_PREF); | 40 PrefService::UNSYNCABLE_PREF); |
59 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSerifFontFamily, | 41 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSerifFontFamily, |
60 IDS_SERIF_FONT_FAMILY, | 42 IDS_SERIF_FONT_FAMILY, |
61 PrefService::UNSYNCABLE_PREF); | 43 PrefService::UNSYNCABLE_PREF); |
62 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSansSerifFontFamily, | 44 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSansSerifFontFamily, |
63 IDS_SANS_SERIF_FONT_FAMILY, | 45 IDS_SANS_SERIF_FONT_FAMILY, |
64 PrefService::UNSYNCABLE_PREF); | 46 PrefService::UNSYNCABLE_PREF); |
65 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldCursiveFontFamily, | 47 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldCursiveFontFamily, |
66 IDS_CURSIVE_FONT_FAMILY, | 48 IDS_CURSIVE_FONT_FAMILY, |
67 PrefService::UNSYNCABLE_PREF); | 49 PrefService::UNSYNCABLE_PREF); |
68 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFantasyFontFamily, | 50 prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFantasyFontFamily, |
69 IDS_FANTASY_FONT_FAMILY, | 51 IDS_FANTASY_FONT_FAMILY, |
70 PrefService::UNSYNCABLE_PREF); | 52 PrefService::UNSYNCABLE_PREF); |
| 53 prefs->RegisterLocalizedStringPref(prefs::kGlobalDefaultCharset, |
| 54 IDS_DEFAULT_ENCODING, |
| 55 PrefService::SYNCABLE_PREF); |
| 56 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFontSize, |
| 57 IDS_DEFAULT_FONT_SIZE, |
| 58 PrefService::UNSYNCABLE_PREF); |
| 59 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFixedFontSize, |
| 60 IDS_DEFAULT_FIXED_FONT_SIZE, |
| 61 PrefService::UNSYNCABLE_PREF); |
| 62 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalMinimumFontSize, |
| 63 IDS_MINIMUM_FONT_SIZE, |
| 64 PrefService::UNSYNCABLE_PREF); |
| 65 prefs->RegisterLocalizedIntegerPref( |
| 66 prefs::kWebKitGlobalMinimumLogicalFontSize, |
| 67 IDS_MINIMUM_LOGICAL_FONT_SIZE, |
| 68 PrefService::UNSYNCABLE_PREF); |
71 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalStandardFontFamily, | 69 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalStandardFontFamily, |
72 IDS_STANDARD_FONT_FAMILY, | 70 IDS_STANDARD_FONT_FAMILY, |
73 PrefService::UNSYNCABLE_PREF); | 71 PrefService::UNSYNCABLE_PREF); |
74 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFixedFontFamily, | 72 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFixedFontFamily, |
75 IDS_FIXED_FONT_FAMILY, | 73 IDS_FIXED_FONT_FAMILY, |
76 PrefService::UNSYNCABLE_PREF); | 74 PrefService::UNSYNCABLE_PREF); |
77 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSerifFontFamily, | 75 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSerifFontFamily, |
78 IDS_SERIF_FONT_FAMILY, | 76 IDS_SERIF_FONT_FAMILY, |
79 PrefService::UNSYNCABLE_PREF); | 77 PrefService::UNSYNCABLE_PREF); |
80 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSansSerifFontFamily, | 78 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSansSerifFontFamily, |
81 IDS_SANS_SERIF_FONT_FAMILY, | 79 IDS_SANS_SERIF_FONT_FAMILY, |
82 PrefService::UNSYNCABLE_PREF); | 80 PrefService::UNSYNCABLE_PREF); |
83 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalCursiveFontFamily, | 81 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalCursiveFontFamily, |
84 IDS_CURSIVE_FONT_FAMILY, | 82 IDS_CURSIVE_FONT_FAMILY, |
85 PrefService::UNSYNCABLE_PREF); | 83 PrefService::UNSYNCABLE_PREF); |
86 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFantasyFontFamily, | 84 prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFantasyFontFamily, |
87 IDS_FANTASY_FONT_FAMILY, | 85 IDS_FANTASY_FONT_FAMILY, |
88 PrefService::UNSYNCABLE_PREF); | 86 PrefService::UNSYNCABLE_PREF); |
89 } | 87 } |
90 | 88 |
91 // The list of prefs we want to observe. | 89 // The list of prefs we want to observe. |
92 const char* kPrefsToObserve[] = { | 90 const char* kPrefsToObserve[] = { |
93 prefs::kDefaultZoomLevel, | 91 prefs::kDefaultZoomLevel, |
94 prefs::kGlobalDefaultCharset, | 92 prefs::kDefaultCharset, |
95 prefs::kEnableReferrers, | 93 prefs::kEnableReferrers, |
96 prefs::kWebKitAllowDisplayingInsecureContent, | 94 prefs::kWebKitAllowDisplayingInsecureContent, |
97 prefs::kWebKitAllowRunningInsecureContent, | 95 prefs::kWebKitAllowRunningInsecureContent, |
98 prefs::kWebKitGlobalDefaultFixedFontSize, | 96 prefs::kWebKitDefaultFixedFontSize, |
99 prefs::kWebKitGlobalDefaultFontSize, | 97 prefs::kWebKitDefaultFontSize, |
100 prefs::kWebKitGlobalJavascriptEnabled, | 98 prefs::kWebKitJavascriptEnabled, |
101 prefs::kWebKitJavaEnabled, | 99 prefs::kWebKitJavaEnabled, |
102 prefs::kWebKitGlobalLoadsImagesAutomatically, | 100 prefs::kWebKitLoadsImagesAutomatically, |
103 prefs::kWebKitGlobalMinimumFontSize, | 101 prefs::kWebKitMinimumFontSize, |
104 prefs::kWebKitGlobalMinimumLogicalFontSize, | 102 prefs::kWebKitMinimumLogicalFontSize, |
105 prefs::kWebKitGlobalPluginsEnabled, | 103 prefs::kWebKitPluginsEnabled, |
106 prefs::kWebkitTabsToLinks, | 104 prefs::kWebkitTabsToLinks, |
107 prefs::kWebKitUsesUniversalDetector | 105 prefs::kWebKitUsesUniversalDetector |
108 }; | 106 }; |
109 | 107 |
110 const int kPrefsToObserveLength = arraysize(kPrefsToObserve); | 108 const int kPrefsToObserveLength = arraysize(kPrefsToObserve); |
111 | 109 |
112 // Registers a preference under the path |map_name| for each script used for | 110 // Registers a preference under the path |map_name| for each script used for |
113 // per-script font prefs. For example, if |map_name| is "fonts.serif", then | 111 // per-script font prefs. For example, if |map_name| is "fonts.serif", then |
114 // "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered. | 112 // "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered. |
115 void RegisterFontFamilyMap(PrefService* prefs, const char* map_name) { | 113 void RegisterFontFamilyMap(PrefService* prefs, const char* map_name) { |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 // non-zero. When it is zero, code like | 246 // non-zero. When it is zero, code like |
249 // for (size_t i = 0; i < kPerScriptFontDefaultsLength; ++i) | 247 // for (size_t i = 0; i < kPerScriptFontDefaultsLength; ++i) |
250 // causes a warning due to comparison of unsigned expression < 0. | 248 // causes a warning due to comparison of unsigned expression < 0. |
251 const size_t kPerScriptFontDefaultsLength = arraysize(kPerScriptFontDefaults); | 249 const size_t kPerScriptFontDefaultsLength = arraysize(kPerScriptFontDefaults); |
252 #endif | 250 #endif |
253 | 251 |
254 const struct { | 252 const struct { |
255 const char* from; | 253 const char* from; |
256 const char* to; | 254 const char* to; |
257 } kPrefNamesToMigrate[] = { | 255 } kPrefNamesToMigrate[] = { |
258 { prefs::kDefaultCharset, | |
259 prefs::kGlobalDefaultCharset }, | |
260 { prefs::kWebKitDefaultFixedFontSize, | |
261 prefs::kWebKitGlobalDefaultFixedFontSize }, | |
262 { prefs::kWebKitDefaultFontSize, | |
263 prefs::kWebKitGlobalDefaultFontSize }, | |
264 { prefs::kWebKitMinimumFontSize, | |
265 prefs::kWebKitGlobalMinimumFontSize }, | |
266 { prefs::kWebKitMinimumLogicalFontSize, | |
267 prefs::kWebKitGlobalMinimumLogicalFontSize }, | |
268 | |
269 // Migrate prefs like "webkit.webprefs.standard_font_family" to | 256 // Migrate prefs like "webkit.webprefs.standard_font_family" to |
270 // "webkit.webprefs.fonts.standard.Zyyy". This moves the formerly | 257 // "webkit.webprefs.fonts.standard.Zyyy". This moves the formerly |
271 // "non-per-script" font prefs into the per-script font pref maps, as the | 258 // "non-per-script" font prefs into the per-script font pref maps, as the |
272 // entry for the "Common" script (Zyyy is the ISO 15924 script code for the | 259 // entry for the "Common" script (Zyyy is the ISO 15924 script code for the |
273 // Common script). The |from| prefs will exist if the migration to global | 260 // Common script). The |from| prefs will exist if the migration to global |
274 // prefs (for the per-tab pref mechanism, which has since been removed) never | 261 // prefs (for the per-tab pref mechanism, which has since been removed) never |
275 // occurred. | 262 // occurred. |
276 { prefs::kWebKitOldCursiveFontFamily, | 263 { prefs::kWebKitOldCursiveFontFamily, |
277 prefs::kWebKitCursiveFontFamily }, | 264 prefs::kWebKitCursiveFontFamily }, |
278 { prefs::kWebKitOldFantasyFontFamily, | 265 { prefs::kWebKitOldFantasyFontFamily, |
279 prefs::kWebKitFantasyFontFamily }, | 266 prefs::kWebKitFantasyFontFamily }, |
280 { prefs::kWebKitOldFixedFontFamily, | 267 { prefs::kWebKitOldFixedFontFamily, |
281 prefs::kWebKitFixedFontFamily }, | 268 prefs::kWebKitFixedFontFamily }, |
282 { prefs::kWebKitOldSansSerifFontFamily, | 269 { prefs::kWebKitOldSansSerifFontFamily, |
283 prefs::kWebKitSansSerifFontFamily }, | 270 prefs::kWebKitSansSerifFontFamily }, |
284 { prefs::kWebKitOldSerifFontFamily, | 271 { prefs::kWebKitOldSerifFontFamily, |
285 prefs::kWebKitSerifFontFamily }, | 272 prefs::kWebKitSerifFontFamily }, |
286 { prefs::kWebKitOldStandardFontFamily, | 273 { prefs::kWebKitOldStandardFontFamily, |
287 prefs::kWebKitStandardFontFamily }, | 274 prefs::kWebKitStandardFontFamily }, |
288 | 275 |
289 // Migrate "global" prefs. These will exist if the migration to global prefs | 276 // Migrate "global" prefs. These will exist if the migration to global prefs |
290 // (for the per-tab pref mechanism, which has since been removed) occurred. | 277 // (for the per-tab pref mechanism, which has since been removed) occurred. |
291 // In addition, this moves the formerly "non-per-script" font prefs into the | 278 // In addition, this moves the formerly "non-per-script" font prefs into the |
292 // per-script font pref maps, as above. | 279 // per-script font pref maps, as above. |
| 280 { prefs::kGlobalDefaultCharset, |
| 281 prefs::kDefaultCharset }, |
| 282 { prefs::kWebKitGlobalDefaultFixedFontSize, |
| 283 prefs::kWebKitDefaultFixedFontSize }, |
| 284 { prefs::kWebKitGlobalDefaultFontSize, |
| 285 prefs::kWebKitDefaultFontSize }, |
| 286 { prefs::kWebKitGlobalMinimumFontSize, |
| 287 prefs::kWebKitMinimumFontSize }, |
| 288 { prefs::kWebKitGlobalMinimumLogicalFontSize, |
| 289 prefs::kWebKitMinimumLogicalFontSize }, |
293 { prefs::kWebKitGlobalCursiveFontFamily, | 290 { prefs::kWebKitGlobalCursiveFontFamily, |
294 prefs::kWebKitCursiveFontFamily }, | 291 prefs::kWebKitCursiveFontFamily }, |
295 { prefs::kWebKitGlobalFantasyFontFamily, | 292 { prefs::kWebKitGlobalFantasyFontFamily, |
296 prefs::kWebKitFantasyFontFamily }, | 293 prefs::kWebKitFantasyFontFamily }, |
297 { prefs::kWebKitGlobalFixedFontFamily, | 294 { prefs::kWebKitGlobalFixedFontFamily, |
298 prefs::kWebKitFixedFontFamily }, | 295 prefs::kWebKitFixedFontFamily }, |
299 { prefs::kWebKitGlobalSansSerifFontFamily, | 296 { prefs::kWebKitGlobalSansSerifFontFamily, |
300 prefs::kWebKitSansSerifFontFamily }, | 297 prefs::kWebKitSansSerifFontFamily }, |
301 { prefs::kWebKitGlobalSerifFontFamily, | 298 { prefs::kWebKitGlobalSerifFontFamily, |
302 prefs::kWebKitSerifFontFamily }, | 299 prefs::kWebKitSerifFontFamily }, |
303 { prefs::kWebKitGlobalStandardFontFamily, | 300 { prefs::kWebKitGlobalStandardFontFamily, |
304 prefs::kWebKitStandardFontFamily } | 301 prefs::kWebKitStandardFontFamily } |
305 }; | 302 }; |
306 | 303 |
307 const int kPrefsToMigrateLength = ARRAYSIZE_UNSAFE(kPrefNamesToMigrate); | 304 const int kPrefsToMigrateLength = ARRAYSIZE_UNSAFE(kPrefNamesToMigrate); |
308 | 305 |
309 static void MigratePreferences(PrefService* prefs) { | 306 static void MigratePreferences(PrefService* prefs) { |
310 RegisterFontsAndCharsetPrefs(prefs); | 307 RegisterPrefsToMigrate(prefs); |
311 for (int i = 0; i < kPrefsToMigrateLength; ++i) { | 308 for (int i = 0; i < kPrefsToMigrateLength; ++i) { |
312 const PrefService::Preference *pref = | 309 const PrefService::Preference *pref = |
313 prefs->FindPreference(kPrefNamesToMigrate[i].from); | 310 prefs->FindPreference(kPrefNamesToMigrate[i].from); |
314 if (!pref) continue; | 311 if (!pref) continue; |
315 if (!pref->IsDefaultValue()) { | 312 if (!pref->IsDefaultValue()) { |
316 prefs->Set(kPrefNamesToMigrate[i].to, *pref->GetValue()->DeepCopy()); | 313 prefs->Set(kPrefNamesToMigrate[i].to, *pref->GetValue()->DeepCopy()); |
317 } | 314 } |
318 prefs->ClearPref(kPrefNamesToMigrate[i].from); | 315 prefs->ClearPref(kPrefNamesToMigrate[i].from); |
319 prefs->UnregisterPreference(kPrefNamesToMigrate[i].from); | 316 prefs->UnregisterPreference(kPrefNamesToMigrate[i].from); |
320 } | 317 } |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 OverlayUserPrefStore* pref_store) { | 361 OverlayUserPrefStore* pref_store) { |
365 // List of keys that cannot be changed in the user prefs file by the incognito | 362 // List of keys that cannot be changed in the user prefs file by the incognito |
366 // profile. All preferences that store information about the browsing history | 363 // profile. All preferences that store information about the browsing history |
367 // or behavior of the user should have this property. | 364 // or behavior of the user should have this property. |
368 pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement); | 365 pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement); |
369 } | 366 } |
370 | 367 |
371 // static | 368 // static |
372 void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) { | 369 void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) { |
373 WebPreferences pref_defaults; | 370 WebPreferences pref_defaults; |
374 prefs->RegisterBooleanPref(prefs::kWebKitGlobalJavascriptEnabled, | 371 prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, |
375 pref_defaults.javascript_enabled, | 372 pref_defaults.javascript_enabled, |
376 PrefService::UNSYNCABLE_PREF); | 373 PrefService::UNSYNCABLE_PREF); |
377 prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled, | 374 prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled, |
378 pref_defaults.web_security_enabled, | 375 pref_defaults.web_security_enabled, |
379 PrefService::UNSYNCABLE_PREF); | 376 PrefService::UNSYNCABLE_PREF); |
380 prefs->RegisterBooleanPref( | 377 prefs->RegisterBooleanPref( |
381 prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically, | 378 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, |
382 true, | 379 true, |
383 PrefService::UNSYNCABLE_PREF); | 380 PrefService::UNSYNCABLE_PREF); |
384 prefs->RegisterBooleanPref(prefs::kWebKitGlobalLoadsImagesAutomatically, | 381 prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically, |
385 pref_defaults.loads_images_automatically, | 382 pref_defaults.loads_images_automatically, |
386 PrefService::UNSYNCABLE_PREF); | 383 PrefService::UNSYNCABLE_PREF); |
387 prefs->RegisterBooleanPref(prefs::kWebKitGlobalPluginsEnabled, | 384 prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled, |
388 pref_defaults.plugins_enabled, | 385 pref_defaults.plugins_enabled, |
389 PrefService::UNSYNCABLE_PREF); | 386 PrefService::UNSYNCABLE_PREF); |
390 prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, | 387 prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, |
391 pref_defaults.dom_paste_enabled, | 388 pref_defaults.dom_paste_enabled, |
392 PrefService::UNSYNCABLE_PREF); | 389 PrefService::UNSYNCABLE_PREF); |
393 prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit, | 390 prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit, |
394 pref_defaults.shrinks_standalone_images_to_fit, | 391 pref_defaults.shrinks_standalone_images_to_fit, |
395 PrefService::UNSYNCABLE_PREF); | 392 PrefService::UNSYNCABLE_PREF); |
396 prefs->RegisterDictionaryPref(prefs::kWebKitInspectorSettings, | 393 prefs->RegisterDictionaryPref(prefs::kWebKitInspectorSettings, |
397 PrefService::UNSYNCABLE_PREF); | 394 PrefService::UNSYNCABLE_PREF); |
(...skipping 16 matching lines...) Expand all Loading... |
414 #if !defined(OS_MACOSX) | 411 #if !defined(OS_MACOSX) |
415 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, | 412 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, |
416 IDS_ACCEPT_LANGUAGES, | 413 IDS_ACCEPT_LANGUAGES, |
417 PrefService::SYNCABLE_PREF); | 414 PrefService::SYNCABLE_PREF); |
418 #else | 415 #else |
419 // Not used in OSX. | 416 // Not used in OSX. |
420 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, | 417 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, |
421 IDS_ACCEPT_LANGUAGES, | 418 IDS_ACCEPT_LANGUAGES, |
422 PrefService::UNSYNCABLE_PREF); | 419 PrefService::UNSYNCABLE_PREF); |
423 #endif | 420 #endif |
424 prefs->RegisterLocalizedStringPref(prefs::kGlobalDefaultCharset, | 421 prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset, |
425 IDS_DEFAULT_ENCODING, | 422 IDS_DEFAULT_ENCODING, |
426 PrefService::SYNCABLE_PREF); | 423 PrefService::SYNCABLE_PREF); |
427 prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily, | 424 prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily, |
428 IDS_STANDARD_FONT_FAMILY, | 425 IDS_STANDARD_FONT_FAMILY, |
429 PrefService::UNSYNCABLE_PREF); | 426 PrefService::UNSYNCABLE_PREF); |
430 prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily, | 427 prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily, |
431 IDS_FIXED_FONT_FAMILY, | 428 IDS_FIXED_FONT_FAMILY, |
432 PrefService::UNSYNCABLE_PREF); | 429 PrefService::UNSYNCABLE_PREF); |
433 prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily, | 430 prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily, |
434 IDS_SERIF_FONT_FAMILY, | 431 IDS_SERIF_FONT_FAMILY, |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
466 #endif | 463 #endif |
467 | 464 |
468 // Register the rest of the per-script font prefs. | 465 // Register the rest of the per-script font prefs. |
469 RegisterFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap); | 466 RegisterFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap); |
470 RegisterFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap); | 467 RegisterFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap); |
471 RegisterFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap); | 468 RegisterFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap); |
472 RegisterFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap); | 469 RegisterFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap); |
473 RegisterFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap); | 470 RegisterFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap); |
474 RegisterFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap); | 471 RegisterFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap); |
475 | 472 |
476 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFontSize, | 473 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize, |
477 IDS_DEFAULT_FONT_SIZE, | 474 IDS_DEFAULT_FONT_SIZE, |
478 PrefService::UNSYNCABLE_PREF); | 475 PrefService::UNSYNCABLE_PREF); |
479 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFixedFontSize, | 476 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFixedFontSize, |
480 IDS_DEFAULT_FIXED_FONT_SIZE, | 477 IDS_DEFAULT_FIXED_FONT_SIZE, |
481 PrefService::UNSYNCABLE_PREF); | 478 PrefService::UNSYNCABLE_PREF); |
482 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalMinimumFontSize, | 479 prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumFontSize, |
483 IDS_MINIMUM_FONT_SIZE, | 480 IDS_MINIMUM_FONT_SIZE, |
484 PrefService::UNSYNCABLE_PREF); | 481 PrefService::UNSYNCABLE_PREF); |
485 prefs->RegisterLocalizedIntegerPref( | 482 prefs->RegisterLocalizedIntegerPref( |
486 prefs::kWebKitGlobalMinimumLogicalFontSize, | 483 prefs::kWebKitMinimumLogicalFontSize, |
487 IDS_MINIMUM_LOGICAL_FONT_SIZE, | 484 IDS_MINIMUM_LOGICAL_FONT_SIZE, |
488 PrefService::UNSYNCABLE_PREF); | 485 PrefService::UNSYNCABLE_PREF); |
489 prefs->RegisterLocalizedBooleanPref(prefs::kWebKitUsesUniversalDetector, | 486 prefs->RegisterLocalizedBooleanPref(prefs::kWebKitUsesUniversalDetector, |
490 IDS_USES_UNIVERSAL_DETECTOR, | 487 IDS_USES_UNIVERSAL_DETECTOR, |
491 PrefService::SYNCABLE_PREF); | 488 PrefService::SYNCABLE_PREF); |
492 prefs->RegisterLocalizedStringPref(prefs::kStaticEncodings, | 489 prefs->RegisterLocalizedStringPref(prefs::kStaticEncodings, |
493 IDS_STATIC_ENCODING_LIST, | 490 IDS_STATIC_ENCODING_LIST, |
494 PrefService::UNSYNCABLE_PREF); | 491 PrefService::UNSYNCABLE_PREF); |
495 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, | 492 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, |
496 "", | 493 "", |
(...skipping 11 matching lines...) Expand all Loading... |
508 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) | 505 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) |
509 case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: { | 506 case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: { |
510 UpdateRendererPreferences(); | 507 UpdateRendererPreferences(); |
511 break; | 508 break; |
512 } | 509 } |
513 #endif | 510 #endif |
514 case chrome::NOTIFICATION_PREF_CHANGED: { | 511 case chrome::NOTIFICATION_PREF_CHANGED: { |
515 std::string* pref_name_in = content::Details<std::string>(details).ptr(); | 512 std::string* pref_name_in = content::Details<std::string>(details).ptr(); |
516 DCHECK(content::Source<PrefService>(source).ptr() == | 513 DCHECK(content::Source<PrefService>(source).ptr() == |
517 GetProfile()->GetPrefs()); | 514 GetProfile()->GetPrefs()); |
518 if ((*pref_name_in == prefs::kDefaultCharset || | 515 if (*pref_name_in == prefs::kDefaultCharset || |
519 *pref_name_in == prefs::kGlobalDefaultCharset) || | |
520 StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) { | 516 StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) { |
521 UpdateWebPreferences(); | 517 UpdateWebPreferences(); |
522 } else if (*pref_name_in == prefs::kDefaultZoomLevel || | 518 } else if (*pref_name_in == prefs::kDefaultZoomLevel || |
523 *pref_name_in == prefs::kEnableReferrers) { | 519 *pref_name_in == prefs::kEnableReferrers) { |
524 UpdateRendererPreferences(); | 520 UpdateRendererPreferences(); |
525 } else { | 521 } else { |
526 NOTREACHED() << "unexpected pref change notification" << *pref_name_in; | 522 NOTREACHED() << "unexpected pref change notification" << *pref_name_in; |
527 } | 523 } |
528 break; | 524 break; |
529 } | 525 } |
(...skipping 11 matching lines...) Expand all Loading... |
541 | 537 |
542 void PrefsTabHelper::UpdateRendererPreferences() { | 538 void PrefsTabHelper::UpdateRendererPreferences() { |
543 renderer_preferences_util::UpdateFromSystemSettings( | 539 renderer_preferences_util::UpdateFromSystemSettings( |
544 web_contents_->GetMutableRendererPrefs(), GetProfile()); | 540 web_contents_->GetMutableRendererPrefs(), GetProfile()); |
545 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); | 541 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); |
546 } | 542 } |
547 | 543 |
548 Profile* PrefsTabHelper::GetProfile() { | 544 Profile* PrefsTabHelper::GetProfile() { |
549 return Profile::FromBrowserContext(web_contents_->GetBrowserContext()); | 545 return Profile::FromBrowserContext(web_contents_->GetBrowserContext()); |
550 } | 546 } |
OLD | NEW |