Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Unified Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 9255018: Add a per-tab preference to match WebSettings::images_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/prefs/prefs_tab_helper.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index b4dcd56497a8af60c9ea953031f7d6b4a986a8f8..937f977927715c07b28f04d64312936cad94017b 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -35,6 +35,7 @@ const char* kPerTabPrefsToObserve[] = {
prefs::kWebKitJavascriptEnabled,
prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
prefs::kWebKitLoadsImagesAutomatically,
+ prefs::kWebKitImagesEnabled,
prefs::kWebKitPluginsEnabled,
prefs::kWebKitCursiveFontFamily,
prefs::kWebKitFantasyFontFamily,
@@ -101,6 +102,9 @@ static void RegisterPerTabUserPrefs(PrefService* prefs) {
prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
pref_defaults.loads_images_automatically,
PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterBooleanPref(prefs::kWebKitImagesEnabled,
+ pref_defaults.images_enabled,
+ PrefService::UNSYNCABLE_PREF);
prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
pref_defaults.plugins_enabled,
PrefService::UNSYNCABLE_PREF);
@@ -393,6 +397,8 @@ void PrefsTabHelper::InitPerTabUserPrefStore(
prefs::kWebKitLoadsImagesAutomatically,
prefs::kWebKitGlobalLoadsImagesAutomatically);
pref_store->RegisterOverlayPref(
+ prefs::kWebKitImagesEnabled);
+ pref_store->RegisterOverlayPref(
prefs::kWebKitPluginsEnabled,
prefs::kWebKitGlobalPluginsEnabled);
pref_store->RegisterOverlayPref(
@@ -611,6 +617,8 @@ void PrefsTabHelper::UpdateWebPreferences() {
prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
prefs.loads_images_automatically =
per_tab_prefs_->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
+ prefs.images_enabled =
+ per_tab_prefs_->GetBoolean(prefs::kWebKitImagesEnabled);
prefs.plugins_enabled =
per_tab_prefs_->GetBoolean(prefs::kWebKitPluginsEnabled);
prefs.standard_font_family =
« no previous file with comments | « no previous file | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698