Migrate the rest of the "global" prefs.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1331 matching lines @@
   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::kWebKitGlobalDefaultFontSize);
+      prefs->GetInteger(prefs::kWebKitDefaultFontSize);
   web_prefs->default_fixed_font_size =
-      prefs->GetInteger(prefs::kWebKitGlobalDefaultFixedFontSize);
+      prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize);
   web_prefs->minimum_font_size =
-      prefs->GetInteger(prefs::kWebKitGlobalMinimumFontSize);
+      prefs->GetInteger(prefs::kWebKitMinimumFontSize);
   web_prefs->minimum_logical_font_size =
-      prefs->GetInteger(prefs::kWebKitGlobalMinimumLogicalFontSize);
+      prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize);
 
-  web_prefs->default_encoding = prefs->GetString(prefs::kGlobalDefaultCharset);
+  web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
 
   web_prefs->javascript_can_open_windows_automatically =
-      prefs->GetBoolean(
-          prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically);
+      prefs->GetBoolean(prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
   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);
 
-  if (!prefs->GetBoolean(prefs::kWebKitGlobalJavascriptEnabled))
+  if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled))
     web_prefs->javascript_enabled = false;
   if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled))
     web_prefs->web_security_enabled = false;
-  if (!prefs->GetBoolean(prefs::kWebKitGlobalPluginsEnabled))
+  if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled))
     web_prefs->plugins_enabled = false;
   if (!prefs->GetBoolean(prefs::kWebKitJavaEnabled))
     web_prefs->java_enabled = false;
   web_prefs->loads_images_automatically =
-      prefs->GetBoolean(prefs::kWebKitGlobalLoadsImagesAutomatically);
+      prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
 
   if (prefs->GetBoolean(prefs::kDisable3DAPIs))
     web_prefs->experimental_webgl_enabled = false;
 
   web_prefs->memory_info_enabled =
       prefs->GetBoolean(prefs::kEnableMemoryInfo);
   web_prefs->allow_displaying_insecure_content =
       prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent);
   web_prefs->allow_running_insecure_content =
       prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent);
@@ skipping 23 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::kGlobalDefaultCharset);
-    web_prefs->default_encoding =
-        prefs->GetString(prefs::kGlobalDefaultCharset);
+    prefs->ClearPref(prefs::kDefaultCharset);
+    web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
   }
   DCHECK(!web_prefs->default_encoding.empty());
 
   ExtensionService* service = profile->GetExtensionService();
   if (service) {
     const Extension* extension = service->extensions()->GetByID(
         rvh->GetSiteInstance()->GetSite().host());
     extension_webkit_preferences::SetPreferences(
         extension, rvh->GetDelegate()->GetRenderViewType(), web_prefs);
   }
@@ skipping 170 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome