Add more per-tab preferences.

chrome/browser/tab_contents/render_view_host_delegate_helper.cc

 // Copyright (c) 2011 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/tab_contents/render_view_host_delegate_helper.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background/background_contents_service.h"
@@ skipping 319 matching lines @@
 
 // static
 WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     RenderViewHost* rvh) {
   Profile* profile = Profile::FromBrowserContext(
       rvh->process()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   WebPreferences web_prefs;
 
   web_prefs.standard_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitStandardFontFamily));
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalStandardFontFamily));
   web_prefs.fixed_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitFixedFontFamily));
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalFixedFontFamily));
   web_prefs.serif_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitSerifFontFamily));
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalSerifFontFamily));
   web_prefs.sans_serif_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily));
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalSansSerifFontFamily));
   web_prefs.cursive_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitCursiveFontFamily));
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalCursiveFontFamily));
   web_prefs.fantasy_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitFantasyFontFamily));
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalFantasyFontFamily));
 
   FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap,
                     &web_prefs.standard_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap,
                     &web_prefs.fixed_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap,
                     &web_prefs.serif_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap,
                     &web_prefs.sans_serif_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap,
                     &web_prefs.cursive_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap,
                     &web_prefs.fantasy_font_family_map);
 
   web_prefs.default_font_size =
-      prefs->GetInteger(prefs::kWebKitDefaultFontSize);
+      prefs->GetInteger(prefs::kWebKitGlobalDefaultFontSize);
   web_prefs.default_fixed_font_size =
-      prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize);
+      prefs->GetInteger(prefs::kWebKitGlobalDefaultFixedFontSize);
   web_prefs.minimum_font_size =
-      prefs->GetInteger(prefs::kWebKitMinimumFontSize);
+      prefs->GetInteger(prefs::kWebKitGlobalMinimumFontSize);
   web_prefs.minimum_logical_font_size =
-      prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize);
+      prefs->GetInteger(prefs::kWebKitGlobalMinimumLogicalFontSize);
 
-  web_prefs.default_encoding = prefs->GetString(prefs::kDefaultCharset);
+  web_prefs.default_encoding = prefs->GetString(prefs::kGlobalDefaultCharset);
 
   web_prefs.javascript_can_open_windows_automatically =
-      prefs->GetBoolean(prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
+      prefs->GetBoolean(
+          prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically);
   web_prefs.dom_paste_enabled =
       prefs->GetBoolean(prefs::kWebKitDomPasteEnabled);
   web_prefs.shrinks_standalone_images_to_fit =
       prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit);
   const DictionaryValue* inspector_settings =
       prefs->GetDictionary(prefs::kWebKitInspectorSettings);
   if (inspector_settings) {
     for (DictionaryValue::key_iterator iter(inspector_settings->begin_keys());
          iter != inspector_settings->end_keys(); ++iter) {
       std::string value;
       if (inspector_settings->GetStringWithoutPathExpansion(*iter, &value))
           web_prefs.inspector_settings.push_back(
               std::make_pair(*iter, value));
     }
   }
   web_prefs.tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks);
 
   {  // Command line switches are used for preferences with no user interface.
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     web_prefs.developer_extras_enabled = true;
     web_prefs.javascript_enabled =
         !command_line.HasSwitch(switches::kDisableJavaScript) &&
         prefs->GetBoolean(prefs::kWebKitGlobalJavascriptEnabled);
     web_prefs.web_security_enabled =
         !command_line.HasSwitch(switches::kDisableWebSecurity) &&
         prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled);
     web_prefs.plugins_enabled =
         !command_line.HasSwitch(switches::kDisablePlugins) &&
-        prefs->GetBoolean(prefs::kWebKitPluginsEnabled);
+        prefs->GetBoolean(prefs::kWebKitGlobalPluginsEnabled);
     web_prefs.java_enabled =
         !command_line.HasSwitch(switches::kDisableJava) &&
         prefs->GetBoolean(prefs::kWebKitJavaEnabled);
     web_prefs.loads_images_automatically =
-        prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
+        prefs->GetBoolean(prefs::kWebKitGlobalLoadsImagesAutomatically);
     web_prefs.uses_page_cache =
         command_line.HasSwitch(switches::kEnableFastback);
     web_prefs.remote_fonts_enabled =
         !command_line.HasSwitch(switches::kDisableRemoteFonts);
     web_prefs.xss_auditor_enabled =
         !command_line.HasSwitch(switches::kDisableXSSAuditor);
     web_prefs.application_cache_enabled =
         !command_line.HasSwitch(switches::kDisableApplicationCache);
 
     web_prefs.local_storage_enabled =
@@ skipping 104 matching lines @@
   web_prefs.text_areas_are_resizable =
       prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
   web_prefs.hyperlink_auditing_enabled =
       prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
 
   // Make sure we will set the default_encoding with canonical encoding name.
   web_prefs.default_encoding =
       CharacterEncoding::GetCanonicalEncodingNameByAliasName(
           web_prefs.default_encoding);
   if (web_prefs.default_encoding.empty()) {
-    prefs->ClearPref(prefs::kDefaultCharset);
-    web_prefs.default_encoding = prefs->GetString(prefs::kDefaultCharset);
+    prefs->ClearPref(prefs::kGlobalDefaultCharset);
+    web_prefs.default_encoding = prefs->GetString(prefs::kGlobalDefaultCharset);
   }
   DCHECK(!web_prefs.default_encoding.empty());
 
   if (ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings(
           rvh->process()->GetID())) {
     web_prefs.loads_images_automatically = true;
     web_prefs.javascript_enabled = true;
   }
 
   web_prefs.is_online = !net::NetworkChangeNotifier::IsOffline();
@@ skipping 33 matching lines @@
   DictionaryValue* inspector_settings = update.Get();
   inspector_settings->SetWithoutPathExpansion(key,
                                               Value::CreateStringValue(value));
 }
 
 void RenderViewHostDelegateHelper::ClearInspectorSettings(
     content::BrowserContext* browser_context) {
   Profile::FromBrowserContext(browser_context)->GetPrefs()->
       ClearPref(prefs::kWebKitInspectorSettings);
 }