Ability to clear old history

chrome/browser/ui/webui/options2/clear_browser_data_handler.cc

 // Copyright (c) 2012 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/options2/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string16.h"
@@ skipping 27 matching lines @@
   if (remover_)
     remover_->RemoveObserver(this);
 }
 
 void ClearBrowserDataHandler::InitializeHandler() {
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
                                       Profile::FromWebUI(web_ui())->GetPrefs(),
                                       NULL);
 }
 
+ListValue* CreateClearOption(BrowsingDataRemover::TimePeriod period, int id) {
+    ListValue* option = new ListValue();
+    option->Append(Value::CreateIntegerValue(period));
+    option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(id)));
+    return option;
+}
+
 void ClearBrowserDataHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "clearBrowserDataLabel", IDS_CLEAR_BROWSING_DATA_LABEL },
     { "deleteBrowsingHistoryCheckbox", IDS_DEL_BROWSING_HISTORY_CHKBOX },
     { "deleteDownloadHistoryCheckbox", IDS_DEL_DOWNLOAD_HISTORY_CHKBOX },
     { "deleteCacheCheckbox", IDS_DEL_CACHE_CHKBOX },
     { "deleteCookiesCheckbox", IDS_DEL_COOKIES_CHKBOX },
     { "deleteCookiesFlashCheckbox", IDS_DEL_COOKIES_FLASH_CHKBOX },
     { "deletePasswordsCheckbox", IDS_DEL_PASSWORDS_CHKBOX },
     { "deleteFormDataCheckbox", IDS_DEL_FORM_DATA_CHKBOX },
     { "deleteHostedAppsDataCheckbox", IDS_DEL_HOSTED_APPS_DATA_CHKBOX },
     { "deauthorizeContentLicensesCheckbox",
       IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX },
     { "clearBrowserDataCommit", IDS_CLEAR_BROWSING_DATA_COMMIT },
     { "flash_storage_url", IDS_FLASH_STORAGE_URL },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "clearBrowserDataOverlay",
                 IDS_CLEAR_BROWSING_DATA_TITLE);
   localized_strings->SetString(
       "clearBrowsingDataLearnMoreUrl",
       google_util::StringAppendGoogleLocaleParam(
           kClearBrowsingDataLearnMoreUrl));
 
   ListValue* time_list = new ListValue;
-  for (int i = 0; i < 5; i++) {
-    string16 label_string;
-    switch (i) {
-      case 0:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_HOUR);
-        break;
-      case 1:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DAY);
-        break;
-      case 2:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_WEEK);
-        break;
-      case 3:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_4WEEKS);
-        break;
-      case 4:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_EVERYTHING);
-        break;
-    }
-    ListValue* option = new ListValue();
-    option->Append(Value::CreateIntegerValue(i));
-    option->Append(Value::CreateStringValue(label_string));
-    time_list->Append(option);
-  }
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::LAST_HOUR, IDS_CLEAR_DATA_HOUR));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::LAST_DAY, IDS_CLEAR_DATA_DAY));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::LAST_WEEK, IDS_CLEAR_DATA_WEEK));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::FOUR_WEEKS, IDS_CLEAR_DATA_4WEEKS));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_LAST_HOUR, IDS_CLEAR_DATA_OLDER_THAN_1HOUR));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_LAST_DAY, IDS_CLEAR_DATA_OLDER_THAN_1DAY));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_LAST_WEEK, IDS_CLEAR_DATA_OLDER_THAN_1WEEK));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_FOUR_WEEKS, IDS_CLEAR_DATA_OLDER_THAN_4WEEKS));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EVERYTHING, IDS_CLEAR_DATA_EVERYTHING));
   localized_strings->Set("clearBrowserDataTimeList", time_list);
 }
 
 void ClearBrowserDataHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   web_ui()->RegisterMessageCallback("performClearBrowserData",
       base::Bind(&ClearBrowserDataHandler::HandleClearBrowserData,
                  base::Unretained(this)));
 }
 
@@ skipping 26 matching lines @@
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses))
     remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
   if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;
     origin_mask |= BrowsingDataHelper::PROTECTED_WEB;
   }
 
   // BrowsingDataRemover deletes itself when done.
   int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
-  remover_ = new BrowsingDataRemover(profile,
-      static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
-      base::Time());
+  remover_ = new BrowsingDataRemover(
+      profile, static_cast<BrowsingDataRemover::TimePeriod>(period_selected));
   remover_->AddObserver(this);
   remover_->Remove(remove_mask, origin_mask);
 }
 
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
 }
 
 }  // namespace options2