web-ui settings: Standard font setting now correlates to WebKit's standard fo...

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 <string>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 179 matching lines @@
 }
 
 bool RenderViewHostDelegateHelper::gpu_enabled_ = true;
 
 // static
 WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     Profile* profile, bool is_web_ui) {
   PrefService* prefs = profile->GetPrefs();
   WebPreferences web_prefs;
 
+  web_prefs.standard_font_family =
+      UTF8ToUTF16(prefs->GetString(prefs::kWebKitStandardFontFamily));
   web_prefs.fixed_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitFixedFontFamily));
   web_prefs.serif_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitSerifFontFamily));
   web_prefs.sans_serif_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily));
-  if (prefs->GetBoolean(prefs::kWebKitStandardFontIsSerif))
-    web_prefs.standard_font_family = web_prefs.serif_font_family;
-  else
-    web_prefs.standard_font_family = web_prefs.sans_serif_font_family;
   web_prefs.cursive_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitCursiveFontFamily));
   web_prefs.fantasy_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitFantasyFontFamily));
 
   web_prefs.default_font_size =
       prefs->GetInteger(prefs::kWebKitDefaultFontSize);
   web_prefs.default_fixed_font_size =
       prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize);
   web_prefs.minimum_font_size =
@@ skipping 128 matching lines @@
   inspector_settings->SetWithoutPathExpansion(key,
                                               Value::CreateStringValue(value));
 }
 
 void RenderViewHostDelegateHelper::ClearInspectorSettings(Profile* profile) {
   DictionaryValue* inspector_settings =
       profile->GetPrefs()->GetMutableDictionary(
           prefs::kWebKitInspectorSettings);
   inspector_settings->Clear();
 }