Add a per-tab preference to match WebSettings::images_enabled.

chrome/browser/ui/prefs/prefs_tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 17 matching lines @@
 
 using content::WebContents;
 
 namespace {
 
 const char* kPerTabPrefsToObserve[] = {
   prefs::kDefaultCharset,
   prefs::kWebKitJavascriptEnabled,
   prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
   prefs::kWebKitLoadsImagesAutomatically,
+  prefs::kWebKitImagesEnabled,
   prefs::kWebKitPluginsEnabled,
   prefs::kWebKitCursiveFontFamily,
   prefs::kWebKitFantasyFontFamily,
   prefs::kWebKitFixedFontFamily,
   prefs::kWebKitSansSerifFontFamily,
   prefs::kWebKitSerifFontFamily,
   prefs::kWebKitStandardFontFamily,
   prefs::kWebKitDefaultFontSize,
   prefs::kWebKitDefaultFixedFontSize,
   prefs::kWebKitMinimumFontSize,
@@ skipping 46 matching lines @@
   prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
                              pref_defaults.javascript_enabled,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(
       prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
       true,
       PrefService::UNSYNCABLE_PREF);
   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);
   RegisterFontsAndCharsetPrefs(prefs);
 }
 
 // The list of prefs we want to observe.
 const char* kPrefsToObserve[] = {
   prefs::kDefaultZoomLevel,
   prefs::kGlobalDefaultCharset,
@@ skipping 272 matching lines @@
   pref_store->RegisterOverlayPref(
       prefs::kWebKitJavascriptEnabled,
       prefs::kWebKitGlobalJavascriptEnabled);
   pref_store->RegisterOverlayPref(
       prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
       prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically);
   pref_store->RegisterOverlayPref(
       prefs::kWebKitLoadsImagesAutomatically,
       prefs::kWebKitGlobalLoadsImagesAutomatically);
   pref_store->RegisterOverlayPref(
+      prefs::kWebKitImagesEnabled);
+  pref_store->RegisterOverlayPref(
       prefs::kWebKitPluginsEnabled,
       prefs::kWebKitGlobalPluginsEnabled);
   pref_store->RegisterOverlayPref(
       prefs::kDefaultCharset,
       prefs::kGlobalDefaultCharset);
   pref_store->RegisterOverlayPref(
       prefs::kWebKitStandardFontFamily,
       prefs::kWebKitGlobalStandardFontFamily);
   pref_store->RegisterOverlayPref(
       prefs::kWebKitFixedFontFamily,
@@ skipping 198 matching lines @@
   RenderViewHostDelegate* rvhd =
       web_contents()->GetRenderViewHost()->delegate();
   WebPreferences prefs = rvhd->GetWebkitPrefs();
   prefs.javascript_enabled =
       per_tab_prefs_->GetBoolean(prefs::kWebKitJavascriptEnabled);
   prefs.javascript_can_open_windows_automatically =
       per_tab_prefs_->GetBoolean(
           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 =
       UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitStandardFontFamily));
   prefs.fixed_font_family =
       UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitFixedFontFamily));
   prefs.serif_font_family =
       UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitSerifFontFamily));
   prefs.sans_serif_font_family =
       UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitSansSerifFontFamily));
@@ skipping 17 matching lines @@
 
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents()->GetMutableRendererPrefs(), GetProfile());
   web_contents()->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }