summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authormunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 21:59:26 +0000
committermunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 21:59:26 +0000
commitaae9eeb10159ca2e345408f74d8425a41bb81ab4 (patch)
treea1843a6f019e1f08f214ac4e11e8346a6614ec8a /chrome/browser/resources
parent4e57c88872d08f8e98ee1bae3258ba38e4694d87 (diff)
downloadchromium_src-aae9eeb10159ca2e345408f74d8425a41bb81ab4.zip
chromium_src-aae9eeb10159ca2e345408f74d8425a41bb81ab4.tar.gz
chromium_src-aae9eeb10159ca2e345408f74d8425a41bb81ab4.tar.bz2
Implement sync data type controller and UI for syncing notifications:
- Add class AppNotificationDataTypeController - Add resources and other things needed for sync UI for app notifications - Add command line flag to enable/disable app notifications sync. Review URL: http://codereview.chromium.org/8320017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/sync_setup_overlay.html8
-rw-r--r--chrome/browser/resources/sync_setup_overlay.js8
2 files changed, 16 insertions, 0 deletions
diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html
index da782e8..2002e22 100644
--- a/chrome/browser/resources/sync_setup_overlay.html
+++ b/chrome/browser/resources/sync_setup_overlay.html
@@ -238,6 +238,14 @@
il8n-values="title:searchEngines"
name="dataTypeLabel"></label>
</div>
+ <div id="app-notifications-item" class="sync-item-show">
+ <input id="app-notifications-checkbox" type="checkbox"
+ name="dataTypeCheckbox">
+ <label for="app-notifications-checkbox"
+ i18n-content="appNotifications"
+ il8n-values="title:appNotifications"
+ name="dataTypeLabel"></label>
+ </div>
</div>
</div>
</div>
diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js
index a60b29b..2876331 100644
--- a/chrome/browser/resources/sync_setup_overlay.js
+++ b/chrome/browser/resources/sync_setup_overlay.js
@@ -250,6 +250,8 @@ cr.define('options', function() {
"syncTypedUrls": syncAll || $('typed-urls-checkbox').checked,
"syncApps": syncAll || $('apps-checkbox').checked,
"syncSearchEngines": syncAll || $('search-engines-checkbox').checked,
+ "syncAppNotifications": syncAll ||
+ $('app-notifications-checkbox').checked,
"syncSessions": syncAll || $('sessions-checkbox').checked,
"encryptAllData": encryptAllData,
"usePassphrase": usePassphrase,
@@ -356,6 +358,12 @@ cr.define('options', function() {
} else {
$('sessions-item').className = "sync-item-hide";
}
+ if (args.appNotificationsRegistered) {
+ $('app-notifications-checkbox').checked = args.syncAppNotifications;
+ $('app-notifications-item').className = "sync-item-show";
+ } else {
+ $('app-notifications-item').className = "sync-item-hide";
+ }
this.setCheckboxesToKeepEverythingSynced_(args.syncAllDataTypes);
},