tabbed options - new clear browsing data overlay

chrome/browser/dom_ui/options/clear_browser_data_handler.cc

 // Copyright (c) 2011 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/dom_ui/options/clear_browser_data_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/values.h"
@@ skipping 18 matching lines @@
 void ClearBrowserDataHandler::Initialize() {
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
                                       g_browser_process->local_state(),
                                       this);
   UpdateClearPluginLSOData();
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
-  localized_strings->SetString("clearBrowsingDataTitle",
+  localized_strings->SetString("clearBrowserDataTitle",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TITLE));
-  localized_strings->SetString("clearBrowsingDataSectionHeader",
-      l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_SECTION_HEADER));
-  localized_strings->SetString("clearBrowsingDataLabel",
+  localized_strings->SetString("clearBrowserDataLabel",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_LABEL));
   localized_strings->SetString("deleteBrowsingHistoryCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_BROWSING_HISTORY_CHKBOX));
   localized_strings->SetString("deleteDownloadHistoryCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_DOWNLOAD_HISTORY_CHKBOX));
   localized_strings->SetString("deleteCacheCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_CACHE_CHKBOX));
   localized_strings->SetString("deleteCookiesCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_COOKIES_CHKBOX));
   localized_strings->SetString("deletePasswordsCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_PASSWORDS_CHKBOX));
   localized_strings->SetString("deleteFormDataCheckbox",
       l10n_util::GetStringUTF16(IDS_DEL_FORM_DATA_CHKBOX));
-  localized_strings->SetString("clearBrowsingDataCommit",
+  localized_strings->SetString("clearBrowserDataCommit",
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_COMMIT));
   localized_strings->SetString("flashStorageSettings",
       l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_SETTINGS));
   localized_strings->SetString("flash_storage_url",
       l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_URL));
   localized_strings->SetString("clearDataDeleting",
       l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DELETING));
 
   ListValue* time_list = new ListValue;
   for (int i = 0; i < 5; i++) {
@@ skipping 13 matching lines @@
         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);
   }
-  localized_strings->Set("clearBrowsingDataTimeList", time_list);
+  localized_strings->Set("clearBrowserDataTimeList", time_list);
 }
 
 void ClearBrowserDataHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback("performClearBrowserData",
       NewCallback(this, &ClearBrowserDataHandler::HandleClearBrowserData));
 }
 
 void ClearBrowserDataHandler::Observe(NotificationType type,
@@ skipping 31 matching lines @@
       remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA;
   }
   if (prefs->GetBoolean(prefs::kDeletePasswords))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (prefs->GetBoolean(prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
 
   int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
 
   FundamentalValue state(true);
-  dom_ui_->CallJavascriptFunction(L"ClearBrowserDataPage.setClearingState",
+  dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.setClearingState",
                                   state);
 
   // BrowsingDataRemover deletes itself when done.
   remover_ = new BrowsingDataRemover(profile,
       static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
       base::Time());
   remover_->AddObserver(this);
   remover_->Remove(remove_mask);
 }
 
 void ClearBrowserDataHandler::UpdateClearPluginLSOData() {
   int label_id = clear_plugin_lso_data_enabled_.GetValue() ?
       IDS_DEL_COOKIES_FLASH_CHKBOX :
       IDS_DEL_COOKIES_CHKBOX;
   scoped_ptr<Value> label(
       Value::CreateStringValue(l10n_util::GetStringUTF16(label_id)));
   dom_ui_->CallJavascriptFunction(
-      L"ClearBrowserDataPage.setClearLocalDataLabel", *label);
+      L"ClearBrowserDataOverlay.setClearLocalDataLabel", *label);
 }
 
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   DCHECK(dom_ui_);
-  dom_ui_->CallJavascriptFunction(L"ClearBrowserDataPage.dismiss");
+  dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.doneClearing");
 }
-