Modify UI and logic in Reset Profile dialog

chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

 // Copyright 2013 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/ui/webui/options/reset_profile_settings_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_service.h"
 #include "base/string16.h"
@@ skipping 25 matching lines @@
 }
 
 void ResetProfileSettingsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "resetProfileSettingsLabel", IDS_RESET_PROFILE_SETTINGS_LABEL },
     { "resetDefaultSearchEngineCheckbox",
        IDS_RESET_PROFILE_DEFAULT_SEARCH_ENGINE_CHECKBOX },
-    { "resetHomepageCheckbox", IDS_RESET_PROFILE_HOMEPAGE_CHECKBOX },
+    { "resetStartupAndHomepageCheckbox",
+       IDS_RESET_PROFILE_STARTUP_HOMEPAGE_CHECKBOX },
     { "resetContentSettingsCheckbox",
        IDS_RESET_PROFILE_CONTENT_SETTINGS_CHECKBOX },
     { "resetCookiesAndSiteDataCheckbox", IDS_RESET_PROFILE_COOKIES_CHECKBOX },
     { "resetExtensionsCheckbox", IDS_RESET_PROFILE_EXTENSIONS_CHECKBOX },
     { "resetProfileSettingsCommit", IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "resetProfileSettingsOverlay",
                 IDS_RESET_PROFILE_SETTINGS_TITLE);
@@ skipping 36 matching lines @@
   DCHECK(resetter_);
   DCHECK(!resetter_->IsActive());
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
   ProfileResetter::ResettableFlags reset_mask = 0;
 
   struct {
     const char* flag_name;
-    ProfileResetter::Resettable mask;
+    ProfileResetter::ResettableFlags mask;
   } name_to_flag[] = {
     { prefs::kResetDefaultSearchEngine,
       ProfileResetter::DEFAULT_SEARCH_ENGINE },
-    { prefs::kResetHomepage, ProfileResetter::HOMEPAGE },
+    { prefs::kResetHomepage, ProfileResetter::HOMEPAGE |
+                             ProfileResetter::STARTUP_PAGE },
     { prefs::kResetContentSettings, ProfileResetter::CONTENT_SETTINGS },
     { prefs::kResetCookiesAndSiteData, ProfileResetter::COOKIES_AND_SITE_DATA },
     { prefs::kResetExtensions, ProfileResetter::EXTENSIONS },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(name_to_flag); ++i) {
     if (prefs->GetBoolean(name_to_flag[i].flag_name))
       reset_mask |= name_to_flag[i].mask;
   }
 
   ProfileResetter::ExtensionHandling extension_handling =
       (prefs->GetInteger(prefs::kResetExtensionsHandling) == 0)
           ? ProfileResetter::DISABLE_EXTENSIONS
           : ProfileResetter::UNINSTALL_EXTENSIONS;
 
   resetter_->Reset(
       reset_mask,
       extension_handling,
       base::Bind(&ResetProfileSettingsHandler::OnResetProfileSettingsDone,
                  AsWeakPtr()));
 }
 
 void ResetProfileSettingsHandler::OnResetProfileSettingsDone() {
   web_ui()->CallJavascriptFunction("ResetProfileSettingsOverlay.doneResetting");
 }
 
 }  // namespace options