| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/prefs/overlay_user_pref_store.h" | 9 #include "base/prefs/overlay_user_pref_store.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 PrefsTabHelper::~PrefsTabHelper() { | 437 PrefsTabHelper::~PrefsTabHelper() { |
| 438 } | 438 } |
| 439 | 439 |
| 440 // static | 440 // static |
| 441 void PrefsTabHelper::InitIncognitoUserPrefStore( | 441 void PrefsTabHelper::InitIncognitoUserPrefStore( |
| 442 OverlayUserPrefStore* pref_store) { | 442 OverlayUserPrefStore* pref_store) { |
| 443 // List of keys that cannot be changed in the user prefs file by the incognito | 443 // List of keys that cannot be changed in the user prefs file by the incognito |
| 444 // profile. All preferences that store information about the browsing history | 444 // profile. All preferences that store information about the browsing history |
| 445 // or behavior of the user should have this property. | 445 // or behavior of the user should have this property. |
| 446 pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement); | 446 pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement); |
| 447 #if defined(OS_ANDROID) | 447 #if defined(OS_ANDROID) || defined(OS_IOS) |
| 448 pref_store->RegisterOverlayPref(prefs::kProxy); | 448 pref_store->RegisterOverlayPref(prefs::kProxy); |
| 449 #endif | 449 #endif // defined(OS_ANDROID) || defined(OS_IOS) |
| 450 } | 450 } |
| 451 | 451 |
| 452 // static | 452 // static |
| 453 void PrefsTabHelper::RegisterUserPrefs(PrefRegistrySyncable* registry) { | 453 void PrefsTabHelper::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 454 WebPreferences pref_defaults; | 454 WebPreferences pref_defaults; |
| 455 registry->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, | 455 registry->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, |
| 456 pref_defaults.javascript_enabled, | 456 pref_defaults.javascript_enabled, |
| 457 PrefRegistrySyncable::UNSYNCABLE_PREF); | 457 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 458 registry->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled, | 458 registry->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled, |
| 459 pref_defaults.web_security_enabled, | 459 pref_defaults.web_security_enabled, |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 WebPreferences web_prefs = | 661 WebPreferences web_prefs = |
| 662 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); | 662 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); |
| 663 OverrideFontFamily(&web_prefs, generic_family, script, ""); | 663 OverrideFontFamily(&web_prefs, generic_family, script, ""); |
| 664 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); | 664 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); |
| 665 return; | 665 return; |
| 666 } | 666 } |
| 667 } | 667 } |
| 668 | 668 |
| 669 UpdateWebPreferences(); | 669 UpdateWebPreferences(); |
| 670 } | 670 } |
| OLD | NEW |