Reset profile: unpin all pinned tabs

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/strings/string16.h"
@@ skipping 42 matching lines @@
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "resetProfileSettingsOverlay",
                 IDS_RESET_PROFILE_SETTINGS_TITLE);
   localized_strings->SetString(
       "resetProfileSettingsLearnMoreUrl",
       google_util::StringAppendGoogleLocaleParam(
           kResetProfileSettingsLearnMoreUrl));
 
   scoped_ptr<ListValue> reset_extensions_handling(new ListValue);

[battre, 2013/06/14 17:51:21]

This block can be deleted

[vasilii, 2013/06/17 11:56:30]

Done.

   for (int i = 0; i < 2; i++) {
     string16 label_string;
     switch (i) {
       case 0:
         label_string = l10n_util::GetStringUTF16(
             IDS_RESET_PROFILE_EXTENSIONS_DISABLE);

[battre, 2013/06/14 17:51:21]

these resources can be deleted from the resource file

[vasilii, 2013/06/17 11:56:30]

Done.

         break;
       case 1:
         label_string = l10n_util::GetStringUTF16(
             IDS_RESET_PROFILE_EXTENSIONS_UNINSTALL);
         break;
     }
     scoped_ptr<ListValue> option(new ListValue);
     option->Append(new base::FundamentalValue(i));
     option->Append(new base::StringValue(label_string));
     reset_extensions_handling->Append(option.release());
@@ skipping 12 matching lines @@
 void ResetProfileSettingsHandler::HandleResetProfileSettings(
     const ListValue* /*value*/) {
   DCHECK(resetter_);
   DCHECK(!resetter_->IsActive());
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
   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 this CL or to put it completely
into a separate CL.

[vasilii, 2013/06/17 11:56:30]

Done.

+
   struct {
     const char* flag_name;
     ProfileResetter::ResettableFlags mask;
   } name_to_flag[] = {
     { 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 },
   };
   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