diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 17:33:57 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 17:33:57 +0000 |
| commit | e77fe00c0a32ad61f3349438580c36ed2f1ac3a5 (patch) | |
| tree | 2090f946cbf3b359ee7f8c4df0dabbbc2459b1cb /chrome/browser | |
| parent | 24c02340498ffed284955b1a978b514f7a5c51e5 (diff) | |
| download | chromium_src-e77fe00c0a32ad61f3349438580c36ed2f1ac3a5.zip chromium_src-e77fe00c0a32ad61f3349438580c36ed2f1ac3a5.tar.gz chromium_src-e77fe00c0a32ad61f3349438580c36ed2f1ac3a5.tar.bz2 | |
Fix clear browser data buttons, broke due to namespace change.
BUG=none
TEST=verify clear browser data buttons work correctly via --enable-tabbed-options.
Review URL: http://codereview.chromium.org/3027039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
3 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/clear_browser_data_handler.cc b/chrome/browser/dom_ui/clear_browser_data_handler.cc index fe3f054..00d2347 100644 --- a/chrome/browser/dom_ui/clear_browser_data_handler.cc +++ b/chrome/browser/dom_ui/clear_browser_data_handler.cc @@ -109,7 +109,8 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const Value* value) { int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod); FundamentalValue state(true); - dom_ui_->CallJavascriptFunction(L"clearBrowserDataSetClearingState", state); + dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.setClearingState", + state); // BrowsingDataRemover deletes itself when done. remover_ = new BrowsingDataRemover(profile, @@ -124,6 +125,6 @@ void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() { // itself after we return. remover_ = NULL; DCHECK(dom_ui_); - dom_ui_->CallJavascriptFunction(L"clearBrowserDataDismiss"); + dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.dismiss"); } diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html index 914752f..2e5e3ba 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.html +++ b/chrome/browser/resources/options/clear_browser_data_overlay.html @@ -46,7 +46,8 @@ <button id="clearBrowsingDataCommit" i18n-content="clearBrowsingDataCommit"></button> <button id="clearBrowsingDataDismiss" i18n-content="cancel" - onclick="clearBrowserDataDismiss();"></button> + onclick="ClearBrowserDataOverlay.dismiss();"> + </button> </td> </tr> </table> diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.js b/chrome/browser/resources/options/clear_browser_data_overlay.js index beb0c14..10f937f 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.js +++ b/chrome/browser/resources/options/clear_browser_data_overlay.js @@ -46,7 +46,7 @@ cr.define('options', function() { // // Chrome callbacks // - function clearBrowserDataSetClearingState(state) { + ClearBrowserDataOverlay.setClearingState = function(state) { $('deleteBrowsingHistoryCheckbox').disabled = state; $('deleteDownloadHistoryCheckbox').disabled = state; $('deleteCacheCheckbox').disabled = state; @@ -73,9 +73,9 @@ cr.define('options', function() { } } - function clearBrowserDataDismiss() { + ClearBrowserDataOverlay.dismiss = function() { OptionsPage.clearOverlays(); - clearBrowserDataSetClearingState(false); + setClearingState(false); } // Export |