summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public/util
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 02:43:40 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-15 02:43:40 +0000
commit5d90a0a29d28df268692a34183aac47967e8030a (patch)
tree2846767f16d96bcb022b46d347120da8013dcb98 /sync/internal_api/public/util
parentcb5d01c34cbcb79a6e49e0932dba95a83e511cd3 (diff)
downloadchromium_src-5d90a0a29d28df268692a34183aac47967e8030a.zip
chromium_src-5d90a0a29d28df268692a34183aac47967e8030a.tar.gz
chromium_src-5d90a0a29d28df268692a34183aac47967e8030a.tar.bz2
[Sync] Add support for remotely enabling keystore encryption
We hook up logic to the keystore_encryption experiment to enable the keystore encryption logic. Once the experiment is received, on the next client restart sync will start using the keystore encryption logic. BUG=129665 Review URL: https://chromiumcodereview.appspot.com/11266045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public/util')
-rw-r--r--sync/internal_api/public/util/experiments.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index 7cea6d6..b5730ce 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -9,17 +9,25 @@
namespace syncer {
+const char kKeystoreEncryptionTag[] = "keystore_encryption";
+const char kKeystoreEncryptionFlag[] = "sync-keystore-encryption";
+
// A structure to hold the enable status of experimental sync features.
struct Experiments {
- Experiments() : sync_tab_favicons(false) {}
+ Experiments() : sync_tab_favicons(false),
+ keystore_encryption(false) {}
bool Matches(const Experiments& rhs) {
- return (sync_tab_favicons == rhs.sync_tab_favicons);
+ return (sync_tab_favicons == rhs.sync_tab_favicons &&
+ keystore_encryption == rhs.keystore_encryption);
}
// Enable syncing of favicons within tab sync (only has an effect if tab sync
// is already enabled). This takes effect on the next restart.
bool sync_tab_favicons;
+
+ // Enable keystore encryption logic and the new encryption UI.
+ bool keystore_encryption;
};
} // namespace syncer