Chromium Code Reviews| Index: chrome/browser/ui/webui/options/reset_profile_settings_handler.cc |
| diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc |
| index 87cf054381ac0e295dbf06020b0f3e3bbd638f09..7a55edd74b5dcfa7d754d5ce9322106169f95432 100644 |
| --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc |
| +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc |
| @@ -99,6 +99,8 @@ void ResetProfileSettingsHandler::HandleResetProfileSettings( |
| ProfileResetter::ResettableFlags reset_mask = 0; |
| + // TODO(vasilii): remove all UI checkboxes and reset ProfileResetter::ALL. |
|
battre
2013/06/14 17:51:21
I think it would be good to have this as part of t
vasilii
2013/06/17 11:56:30
Done.
|
| + |
| struct { |
| const char* flag_name; |
| ProfileResetter::ResettableFlags mask; |
| @@ -106,7 +108,8 @@ void ResetProfileSettingsHandler::HandleResetProfileSettings( |
| { prefs::kResetDefaultSearchEngine, |
| ProfileResetter::DEFAULT_SEARCH_ENGINE }, |
| { prefs::kResetHomepage, ProfileResetter::HOMEPAGE | |
| - ProfileResetter::STARTUP_PAGE }, |
| + ProfileResetter::STARTUP_PAGES | |
| + ProfileResetter::PINNED_TABS }, |
| { prefs::kResetContentSettings, ProfileResetter::CONTENT_SETTINGS }, |
| { prefs::kResetCookiesAndSiteData, ProfileResetter::COOKIES_AND_SITE_DATA }, |
| { prefs::kResetExtensions, ProfileResetter::EXTENSIONS }, |
| @@ -116,14 +119,8 @@ void ResetProfileSettingsHandler::HandleResetProfileSettings( |
| 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())); |
| } |