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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10409046: Migrate the rest of the "global" prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style fixes Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap, 1341 FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap,
1342 &web_prefs->serif_font_family_map); 1342 &web_prefs->serif_font_family_map);
1343 FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap, 1343 FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap,
1344 &web_prefs->sans_serif_font_family_map); 1344 &web_prefs->sans_serif_font_family_map);
1345 FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap, 1345 FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap,
1346 &web_prefs->cursive_font_family_map); 1346 &web_prefs->cursive_font_family_map);
1347 FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap, 1347 FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap,
1348 &web_prefs->fantasy_font_family_map); 1348 &web_prefs->fantasy_font_family_map);
1349 1349
1350 web_prefs->default_font_size = 1350 web_prefs->default_font_size =
1351 prefs->GetInteger(prefs::kWebKitGlobalDefaultFontSize); 1351 prefs->GetInteger(prefs::kWebKitDefaultFontSize);
1352 web_prefs->default_fixed_font_size = 1352 web_prefs->default_fixed_font_size =
1353 prefs->GetInteger(prefs::kWebKitGlobalDefaultFixedFontSize); 1353 prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize);
1354 web_prefs->minimum_font_size = 1354 web_prefs->minimum_font_size =
1355 prefs->GetInteger(prefs::kWebKitGlobalMinimumFontSize); 1355 prefs->GetInteger(prefs::kWebKitMinimumFontSize);
1356 web_prefs->minimum_logical_font_size = 1356 web_prefs->minimum_logical_font_size =
1357 prefs->GetInteger(prefs::kWebKitGlobalMinimumLogicalFontSize); 1357 prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize);
1358 1358
1359 web_prefs->default_encoding = prefs->GetString(prefs::kGlobalDefaultCharset); 1359 web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
1360 1360
1361 web_prefs->javascript_can_open_windows_automatically = 1361 web_prefs->javascript_can_open_windows_automatically =
1362 prefs->GetBoolean( 1362 prefs->GetBoolean(prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
1363 prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically);
1364 web_prefs->dom_paste_enabled = 1363 web_prefs->dom_paste_enabled =
1365 prefs->GetBoolean(prefs::kWebKitDomPasteEnabled); 1364 prefs->GetBoolean(prefs::kWebKitDomPasteEnabled);
1366 web_prefs->shrinks_standalone_images_to_fit = 1365 web_prefs->shrinks_standalone_images_to_fit =
1367 prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit); 1366 prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit);
1368 const DictionaryValue* inspector_settings = 1367 const DictionaryValue* inspector_settings =
1369 prefs->GetDictionary(prefs::kWebKitInspectorSettings); 1368 prefs->GetDictionary(prefs::kWebKitInspectorSettings);
1370 if (inspector_settings) { 1369 if (inspector_settings) {
1371 for (DictionaryValue::key_iterator iter(inspector_settings->begin_keys()); 1370 for (DictionaryValue::key_iterator iter(inspector_settings->begin_keys());
1372 iter != inspector_settings->end_keys(); ++iter) { 1371 iter != inspector_settings->end_keys(); ++iter) {
1373 std::string value; 1372 std::string value;
1374 if (inspector_settings->GetStringWithoutPathExpansion(*iter, &value)) 1373 if (inspector_settings->GetStringWithoutPathExpansion(*iter, &value))
1375 web_prefs->inspector_settings.push_back( 1374 web_prefs->inspector_settings.push_back(
1376 std::make_pair(*iter, value)); 1375 std::make_pair(*iter, value));
1377 } 1376 }
1378 } 1377 }
1379 web_prefs->tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks); 1378 web_prefs->tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks);
1380 1379
1381 if (!prefs->GetBoolean(prefs::kWebKitGlobalJavascriptEnabled)) 1380 if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled))
1382 web_prefs->javascript_enabled = false; 1381 web_prefs->javascript_enabled = false;
1383 if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled)) 1382 if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled))
1384 web_prefs->web_security_enabled = false; 1383 web_prefs->web_security_enabled = false;
1385 if (!prefs->GetBoolean(prefs::kWebKitGlobalPluginsEnabled)) 1384 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled))
1386 web_prefs->plugins_enabled = false; 1385 web_prefs->plugins_enabled = false;
1387 if (!prefs->GetBoolean(prefs::kWebKitJavaEnabled)) 1386 if (!prefs->GetBoolean(prefs::kWebKitJavaEnabled))
1388 web_prefs->java_enabled = false; 1387 web_prefs->java_enabled = false;
1389 web_prefs->loads_images_automatically = 1388 web_prefs->loads_images_automatically =
1390 prefs->GetBoolean(prefs::kWebKitGlobalLoadsImagesAutomatically); 1389 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
1391 1390
1392 if (prefs->GetBoolean(prefs::kDisable3DAPIs)) 1391 if (prefs->GetBoolean(prefs::kDisable3DAPIs))
1393 web_prefs->experimental_webgl_enabled = false; 1392 web_prefs->experimental_webgl_enabled = false;
1394 1393
1395 web_prefs->memory_info_enabled = 1394 web_prefs->memory_info_enabled =
1396 prefs->GetBoolean(prefs::kEnableMemoryInfo); 1395 prefs->GetBoolean(prefs::kEnableMemoryInfo);
1397 web_prefs->allow_displaying_insecure_content = 1396 web_prefs->allow_displaying_insecure_content =
1398 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); 1397 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent);
1399 web_prefs->allow_running_insecure_content = 1398 web_prefs->allow_running_insecure_content =
1400 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); 1399 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent);
(...skipping 23 matching lines...) Expand all
1424 web_prefs->text_areas_are_resizable = 1423 web_prefs->text_areas_are_resizable =
1425 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); 1424 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
1426 web_prefs->hyperlink_auditing_enabled = 1425 web_prefs->hyperlink_auditing_enabled =
1427 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); 1426 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
1428 1427
1429 // Make sure we will set the default_encoding with canonical encoding name. 1428 // Make sure we will set the default_encoding with canonical encoding name.
1430 web_prefs->default_encoding = 1429 web_prefs->default_encoding =
1431 CharacterEncoding::GetCanonicalEncodingNameByAliasName( 1430 CharacterEncoding::GetCanonicalEncodingNameByAliasName(
1432 web_prefs->default_encoding); 1431 web_prefs->default_encoding);
1433 if (web_prefs->default_encoding.empty()) { 1432 if (web_prefs->default_encoding.empty()) {
1434 prefs->ClearPref(prefs::kGlobalDefaultCharset); 1433 prefs->ClearPref(prefs::kDefaultCharset);
1435 web_prefs->default_encoding = 1434 web_prefs->default_encoding =
1436 prefs->GetString(prefs::kGlobalDefaultCharset); 1435 prefs->GetString(prefs::kDefaultCharset);
Peter Kasting 2012/05/21 21:37:20 Nit: Will fit on one line
falken 2012/05/22 02:24:21 Done.
1437 } 1436 }
1438 DCHECK(!web_prefs->default_encoding.empty()); 1437 DCHECK(!web_prefs->default_encoding.empty());
1439 1438
1440 ExtensionService* service = profile->GetExtensionService(); 1439 ExtensionService* service = profile->GetExtensionService();
1441 if (service) { 1440 if (service) {
1442 const Extension* extension = service->extensions()->GetByID( 1441 const Extension* extension = service->extensions()->GetByID(
1443 rvh->GetSiteInstance()->GetSite().host()); 1442 rvh->GetSiteInstance()->GetSite().host());
1444 extension_webkit_preferences::SetPreferences( 1443 extension_webkit_preferences::SetPreferences(
1445 extension, rvh->GetDelegate()->GetRenderViewType(), web_prefs); 1444 extension, rvh->GetDelegate()->GetRenderViewType(), web_prefs);
1446 } 1445 }
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 #if defined(USE_NSS) 1616 #if defined(USE_NSS)
1618 crypto::CryptoModuleBlockingPasswordDelegate* 1617 crypto::CryptoModuleBlockingPasswordDelegate*
1619 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1618 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1620 const GURL& url) { 1619 const GURL& url) {
1621 return browser::NewCryptoModuleBlockingDialogDelegate( 1620 return browser::NewCryptoModuleBlockingDialogDelegate(
1622 browser::kCryptoModulePasswordKeygen, url.host()); 1621 browser::kCryptoModulePasswordKeygen, url.host());
1623 } 1622 }
1624 #endif 1623 #endif
1625 1624
1626 } // namespace chrome 1625 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698