summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/options/personal_options.js
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 17:42:57 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 17:42:57 +0000
commitc3482e2107a6ad69db6d2c6de266f4ad4d27cc6b (patch)
treebdc559cb804dd086436d488b8bfb8f7c11ca4ded /chrome/browser/resources/options/personal_options.js
parent386c7350ed9b017020e84d4b1783c318e68418ab (diff)
downloadchromium_src-c3482e2107a6ad69db6d2c6de266f4ad4d27cc6b.zip
chromium_src-c3482e2107a6ad69db6d2c6de266f4ad4d27cc6b.tar.gz
chromium_src-c3482e2107a6ad69db6d2c6de266f4ad4d27cc6b.tar.bz2
dom-ui options: Import dialog improvements
- Fixed so that import window is setup correctly when invoked directly from a command. - Correctly enable/disable checkboxes based on what services are supported by a profile. - Changes to avoid relying on the exact order of checkboxes in the DOM. - Changes to use ExternalProcessImporterHost instead of ImporterHost (MacOS X). - Put ok/cancel buttons in a button strip. BUG=none TEST=verify Import dialog works properly via dom-ui (--enable-tabbed-options) Review URL: http://codereview.chromium.org/3363012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/options/personal_options.js')
-rw-r--r--chrome/browser/resources/options/personal_options.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 7b9f170..e0516418 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -62,10 +62,13 @@ cr.define('options', function() {
if (!cr.isChromeOS) {
$('stop-sync').onclick = function(event) {
- OptionsPage.showOverlay('stopSyncingOverlay');
+ AlertOverlay.show(localStrings.getString('stop_syncing_title'),
+ localStrings.getString('stop_syncing_explanation'),
+ localStrings.getString('yesButtonLabel'),
+ localStrings.getString('noButtonLabel'),
+ function() { chrome.send('stopSyncing'); });
};
$('import_data').onclick = function(event) {
- ImportDataOverlay.loadImporter();
OptionsPage.showOverlay('importDataOverlay');
chrome.send('coreOptionsUserMetricsAction', ['Import_ShowDlg']);
};