Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2235)

Unified Diff: chrome/browser/resources/options/clear_browser_data.js

Issue 6110006: give tabbed options clear browsing dialog a facelift (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delete bugs Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/clear_browser_data.js
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.js b/chrome/browser/resources/options/clear_browser_data.js
similarity index 80%
rename from chrome/browser/resources/options/clear_browser_data_overlay.js
rename to chrome/browser/resources/options/clear_browser_data.js
index 6b1cf054ca853c23e2a94b1804b29cc5572bdb93..713df7e6615f984643dc647f2c032db7f1942fc3 100644
--- a/chrome/browser/resources/options/clear_browser_data_overlay.js
+++ b/chrome/browser/resources/options/clear_browser_data.js
@@ -11,18 +11,18 @@ cr.define('options', function() {
* Encapsulated handling of the 'Clear Browser Data' overlay page.
* @class
*/
- function ClearBrowserDataOverlay() {
- OptionsPage.call(this, 'clearBrowserDataOverlay',
+ function ClearBrowserDataPage() {
+ OptionsPage.call(this, 'clearBrowserDataPage',
templateData.clearBrowserDataTitle,
- 'clearBrowserDataOverlay');
+ 'clearBrowserDataPage');
}
- ClearBrowserDataOverlay.throbIntervalId = 0;
+ ClearBrowserDataPage.throbIntervalId = 0;
- cr.addSingletonGetter(ClearBrowserDataOverlay);
+ cr.addSingletonGetter(ClearBrowserDataPage);
- ClearBrowserDataOverlay.prototype = {
- // Inherit ClearBrowserDataOverlay from OptionsPage.
+ ClearBrowserDataPage.prototype = {
+ // Inherit ClearBrowserDataPage from OptionsPage.
__proto__: OptionsPage.prototype,
/**
@@ -32,6 +32,9 @@ cr.define('options', function() {
// Call base class implementation to starts preference initialization.
OptionsPage.prototype.initializePage.call(this);
+ // The time period is stored as a number.
+ $('clearBrowsingDataTimePeriod').dataType = 'number';
+
var f = this.updateCommitButtonState_.bind(this);
var types = ['browser.clear_data.browsing_history',
'browser.clear_data.download_history',
@@ -74,7 +77,7 @@ cr.define('options', function() {
//
// Chrome callbacks
//
- ClearBrowserDataOverlay.setClearingState = function(state) {
+ ClearBrowserDataPage.setClearingState = function(state) {
$('deleteBrowsingHistoryCheckbox').disabled = state;
$('deleteDownloadHistoryCheckbox').disabled = state;
$('deleteCacheCheckbox').disabled = state;
@@ -82,13 +85,12 @@ cr.define('options', function() {
$('deletePasswordsCheckbox').disabled = state;
$('deleteFormDataCheckbox').disabled = state;
$('clearBrowsingDataTimePeriod').disabled = state;
- $('clearBrowsingDataDismiss').disabled = state;
$('cbdThrobber').style.visibility = state ? 'visible' : 'hidden';
if (state)
$('clearBrowsingDataCommit').disabled = true;
else
- ClearBrowserDataOverlay.getInstance().updateCommitButtonState_();
+ ClearBrowserDataPage.getInstance().updateCommitButtonState_();
function advanceThrobber() {
var throbber = $('cbdThrobber');
@@ -98,21 +100,21 @@ cr.define('options', function() {
576) + 'px';
}
if (state) {
- ClearBrowserDataOverlay.throbIntervalId =
+ ClearBrowserDataPage.throbIntervalId =
setInterval(advanceThrobber, 30);
} else {
- clearInterval(ClearBrowserDataOverlay.throbIntervalId);
+ clearInterval(ClearBrowserDataPage.throbIntervalId);
}
}
- ClearBrowserDataOverlay.dismiss = function() {
+ ClearBrowserDataPage.dismiss = function() {
OptionsPage.clearOverlays();
this.setClearingState(false);
}
// Export
return {
- ClearBrowserDataOverlay: ClearBrowserDataOverlay
+ ClearBrowserDataPage: ClearBrowserDataPage
};
});

Powered by Google App Engine
This is Rietveld 408576698