summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authoralbertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 21:35:32 +0000
committeralbertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 21:35:32 +0000
commitbb899b3fe2faa8e58920dd210ff9e9634838f9e2 (patch)
treed8b92db816fa6b6ec4f8b83ddf9e74e52ca38c7a /chrome/common
parent9ba72485493030204853351beaf92462d33f310a (diff)
downloadchromium_src-bb899b3fe2faa8e58920dd210ff9e9634838f9e2.zip
chromium_src-bb899b3fe2faa8e58920dd210ff9e9634838f9e2.tar.gz
chromium_src-bb899b3fe2faa8e58920dd210ff9e9634838f9e2.tar.bz2
Take 2: sync changes to support encryption
Attempting to resubmit this change. It looks like the reason for the build break on linux was a missing dependency (nss) in the interactive_ui_test target. BUG=32410 TEST=unittests Review URL: http://codereview.chromium.org/2828021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/notification_type.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 93145d1..464f629 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -997,6 +997,17 @@ class NotificationType {
// operations.
SESSION_SERVICE_SAVED,
+ // The syncer requires a passphrase to decrypt sensitive updates. This
+ // notification is sent when the first sensitive data type is setup by the
+ // user as well as anytime any the passphrase is changed in another synced
+ // client.
+ SYNC_PASSPHRASE_REQUIRED,
+
+ // Sent when the passphrase provided by the user is accepted. After this
+ // notification is sent, updates to sensitive nodes are encrypted using the
+ // accepted passphrase.
+ SYNC_PASSPHRASE_ACCEPTED,
+
// Cookies -----------------------------------------------------------------
// Sent when a cookie changes. The source is a Profile object, the details