summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 21:56:29 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 21:56:29 +0000
commit2e56148c4571f112d03d245f2e50a13cdd88fed0 (patch)
tree3c9a24ae39bb64d4d6b37e09234db8299e02f4db /chrome/browser/dom_ui
parent10689124490b2319d52349bce3840ddf8424ec30 (diff)
downloadchromium_src-2e56148c4571f112d03d245f2e50a13cdd88fed0.zip
chromium_src-2e56148c4571f112d03d245f2e50a13cdd88fed0.tar.gz
chromium_src-2e56148c4571f112d03d245f2e50a13cdd88fed0.tar.bz2
give tabbed options clear browsing dialog a facelift
It should now match the mocks modulo the adobe flash settings link (not sure why the mocks show it as a checkbox; AFAIK making it a checkbox is outside our ability to do). also make it work (the time period select dropdown was broken). BUG=69163,63843 TEST=manual Review URL: http://codereview.chromium.org/6110006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/options/clear_browser_data_handler.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/dom_ui/options/clear_browser_data_handler.cc b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc
index 21f2121..e21f7a2 100644
--- a/chrome/browser/dom_ui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -29,10 +29,10 @@ void ClearBrowserDataHandler::GetLocalizedValues(
DCHECK(localized_strings);
localized_strings->SetString("clearBrowsingDataTitle",
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",
l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_LABEL));
- localized_strings->SetString("clearBrowsingDataTimeLabel",
- l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TIME_LABEL));
localized_strings->SetString("deleteBrowsingHistoryCheckbox",
l10n_util::GetStringUTF16(IDS_DEL_BROWSING_HISTORY_CHKBOX));
localized_strings->SetString("deleteDownloadHistoryCheckbox",
@@ -90,8 +90,8 @@ void ClearBrowserDataHandler::RegisterMessages() {
}
void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
- Profile *profile = dom_ui_->GetProfile();
- PrefService *prefs = profile->GetPrefs();
+ Profile* profile = dom_ui_->GetProfile();
+ PrefService* prefs = profile->GetPrefs();
int remove_mask = 0;
if (prefs->GetBoolean(prefs::kDeleteBrowsingHistory))