summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 19:49:50 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 19:49:50 +0000
commita83f925ea3ead73f682f33002501d7fe02b22219 (patch)
tree9be30503bf289a0d22d0d8e001ce73b6c0cfcc7e
parenteff38d757cff8db7fbb609e6be8a60eae252d325 (diff)
downloadchromium_src-a83f925ea3ead73f682f33002501d7fe02b22219.zip
chromium_src-a83f925ea3ead73f682f33002501d7fe02b22219.tar.gz
chromium_src-a83f925ea3ead73f682f33002501d7fe02b22219.tar.bz2
Removed 'stop syncing' button from chromeos options.
BUG=chromium-os:5842 TEST=make sure 'stop syncing' button never shows up on chrome os options (domui) Review URL: http://codereview.chromium.org/3190007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56579 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/personal_options.html2
-rw-r--r--chrome/browser/resources/options/personal_options.js6
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index f00bacf..a90cb50 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -14,7 +14,9 @@
<div id="synced-controls" class="hidden">
<div class="section-text" id="synced_to_user_with_time"></div>
<div>
+<if expr="not pp_ifdef('chromeos')">
<button id="stop-sync" i18n-content="stop_sync"></button>
+</if>
<button id="sync-customize" i18n-content="sync_customize"></button>
</div>
</div>
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 04c3b08..d335f9a 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -26,9 +26,6 @@ cr.define('options', function() {
// Call base class implementation to starts preference initialization.
OptionsPage.prototype.initializePage.call(this);
- $('stop-sync').onclick = function(event) {
- OptionsPage.showOverlay('stopSyncingOverlay');
- };
$('sync-customize').onclick = function(event) {
OptionsPage.showPageByName('sync');
};
@@ -67,6 +64,9 @@ cr.define('options', function() {
};
if (!cr.isChromeOS) {
+ $('stop-sync').onclick = function(event) {
+ OptionsPage.showOverlay('stopSyncingOverlay');
+ };
$('import_data').onclick = function(event) {
OptionsPage.showOverlay('importDataOverlay');
};