OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/stringprintf.h" | 7 #include "base/stringprintf.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 WebPreferences pref_defaults; | 35 WebPreferences pref_defaults; |
36 | 36 |
37 prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, | 37 prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, |
38 pref_defaults.javascript_enabled, | 38 pref_defaults.javascript_enabled, |
39 PrefService::UNSYNCABLE_PREF); | 39 PrefService::UNSYNCABLE_PREF); |
40 } | 40 } |
41 | 41 |
42 // The list of prefs we want to observe. | 42 // The list of prefs we want to observe. |
43 const char* kPrefsToObserve[] = { | 43 const char* kPrefsToObserve[] = { |
44 prefs::kDefaultCharset, | 44 prefs::kDefaultCharset, |
| 45 prefs::kDefaultZoomLevel, |
45 prefs::kEnableReferrers, | 46 prefs::kEnableReferrers, |
46 prefs::kWebKitAllowDisplayingInsecureContent, | 47 prefs::kWebKitAllowDisplayingInsecureContent, |
47 prefs::kWebKitAllowRunningInsecureContent, | 48 prefs::kWebKitAllowRunningInsecureContent, |
48 prefs::kWebKitCursiveFontFamily, | 49 prefs::kWebKitCursiveFontFamily, |
49 prefs::kWebKitDefaultFixedFontSize, | 50 prefs::kWebKitDefaultFixedFontSize, |
50 prefs::kWebKitDefaultFontSize, | 51 prefs::kWebKitDefaultFontSize, |
51 prefs::kWebKitFantasyFontFamily, | 52 prefs::kWebKitFantasyFontFamily, |
52 prefs::kWebKitFixedFontFamily, | 53 prefs::kWebKitFixedFontFamily, |
53 prefs::kWebKitGlobalJavascriptEnabled, | 54 prefs::kWebKitGlobalJavascriptEnabled, |
54 prefs::kWebKitJavaEnabled, | 55 prefs::kWebKitJavaEnabled, |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 } | 403 } |
403 #endif | 404 #endif |
404 case chrome::NOTIFICATION_PREF_CHANGED: { | 405 case chrome::NOTIFICATION_PREF_CHANGED: { |
405 std::string* pref_name_in = content::Details<std::string>(details).ptr(); | 406 std::string* pref_name_in = content::Details<std::string>(details).ptr(); |
406 DCHECK(content::Source<PrefService>(source).ptr() == | 407 DCHECK(content::Source<PrefService>(source).ptr() == |
407 wrapper_->profile()->GetPrefs() || | 408 wrapper_->profile()->GetPrefs() || |
408 content::Source<PrefService>(source).ptr() == per_tab_prefs_); | 409 content::Source<PrefService>(source).ptr() == per_tab_prefs_); |
409 if ((*pref_name_in == prefs::kDefaultCharset) || | 410 if ((*pref_name_in == prefs::kDefaultCharset) || |
410 StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) { | 411 StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) { |
411 UpdateWebPreferences(); | 412 UpdateWebPreferences(); |
412 } else if (*pref_name_in == prefs::kEnableReferrers) { | 413 } else if (*pref_name_in == prefs::kDefaultZoomLevel || |
| 414 *pref_name_in == prefs::kEnableReferrers) { |
413 UpdateRendererPreferences(); | 415 UpdateRendererPreferences(); |
414 } else { | 416 } else { |
415 NOTREACHED() << "unexpected pref change notification" << *pref_name_in; | 417 NOTREACHED() << "unexpected pref change notification" << *pref_name_in; |
416 } | 418 } |
417 break; | 419 break; |
418 } | 420 } |
419 default: | 421 default: |
420 NOTREACHED(); | 422 NOTREACHED(); |
421 } | 423 } |
422 } | 424 } |
423 | 425 |
424 void PrefsTabHelper::UpdateWebPreferences() { | 426 void PrefsTabHelper::UpdateWebPreferences() { |
425 RenderViewHostDelegate* rvhd = tab_contents(); | 427 RenderViewHostDelegate* rvhd = tab_contents(); |
426 WebPreferences prefs = rvhd->GetWebkitPrefs(); | 428 WebPreferences prefs = rvhd->GetWebkitPrefs(); |
427 prefs.javascript_enabled = | 429 prefs.javascript_enabled = |
428 per_tab_prefs_->GetBoolean(prefs::kWebKitJavascriptEnabled); | 430 per_tab_prefs_->GetBoolean(prefs::kWebKitJavascriptEnabled); |
429 tab_contents()->render_view_host()->UpdateWebkitPreferences(prefs); | 431 tab_contents()->render_view_host()->UpdateWebkitPreferences(prefs); |
430 } | 432 } |
431 | 433 |
432 void PrefsTabHelper::UpdateRendererPreferences() { | 434 void PrefsTabHelper::UpdateRendererPreferences() { |
433 renderer_preferences_util::UpdateFromSystemSettings( | 435 renderer_preferences_util::UpdateFromSystemSettings( |
434 tab_contents()->GetMutableRendererPrefs(), wrapper_->profile()); | 436 tab_contents()->GetMutableRendererPrefs(), wrapper_->profile()); |
435 tab_contents()->render_view_host()->SyncRendererPrefs(); | 437 tab_contents()->render_view_host()->SyncRendererPrefs(); |
436 } | 438 } |
OLD | NEW |