Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 10 insertions, 7 deletions

diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc
index 8bcf063..97f0012 100644
--- a/chrome/browser/options_util.cc
+++ b/chrome/browser/options_util.cc
@@ -5,13 +5,15 @@
 #include "chrome/browser/options_util.h"
 
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/profile.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/pref_service.h"
+#include "chrome/browser/notifications/desktop_notification_service.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 
@@ -21,9 +23,10 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
   // changes to any of the options pages doesn't require updating this list
   // manually.
   PrefService* prefs = profile->GetPrefs();
-  const wchar_t* kUserPrefs[] = {
+  const char* kUserPrefs[] = {
     prefs::kAcceptLanguages,
     prefs::kAlternateErrorPagesEnabled,
+    prefs::kBackgroundModeEnabled,
     prefs::kClearSiteDataOnExit,
     prefs::kCookieBehavior,
     prefs::kDefaultCharset,
@@ -36,8 +39,6 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
 #endif
 #if defined(OS_CHROMEOS)
     prefs::kTapToClickEnabled,
-    prefs::kVertEdgeScrollEnabled,
-    prefs::kTouchpadSpeedFactor,
     prefs::kTouchpadSensitivity,
 #endif
     prefs::kDownloadDefaultDirectory,
@@ -45,6 +46,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
     prefs::kEnableSpellCheck,
     prefs::kEnableTranslate,
     prefs::kAutoFillEnabled,
+    prefs::kAutoFillAuxiliaryProfilesEnabled,
     prefs::kHomePage,
     prefs::kHomePageIsNewTabPage,
     prefs::kPromptForDownload,
@@ -66,10 +68,11 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
     prefs::kWebKitSerifFontFamily,
     prefs::kWebkitTabsToLinks,
   };
-  profile->GetDownloadManager()->ResetAutoOpenFiles();
+  profile->GetDownloadManager()->download_prefs()->ResetToDefaults();
   profile->GetHostContentSettingsMap()->ResetToDefaults();
   profile->GetGeolocationContentSettingsMap()->ResetToDefault();
   profile->GetHostZoomMap()->ResetToDefaults();
+  profile->GetDesktopNotificationService()->ResetToDefaultContentSetting();
   for (size_t i = 0; i < arraysize(kUserPrefs); ++i)
     prefs->ClearPref(kUserPrefs[i]);
 
@@ -81,7 +84,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
   // settings they'll either inadvertedly enable this logging or disable it.
   // One is undesirable for them, one is undesirable for us. For now, we just
   // don't reset it.
-  const wchar_t* kLocalStatePrefs[] = {
+  const char* kLocalStatePrefs[] = {
     prefs::kApplicationLocale,
   };
   for (size_t i = 0; i < arraysize(kLocalStatePrefs); ++i)