summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorrdevlin.cronin <rdevlin.cronin@chromium.org>2015-02-12 16:25:57 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-13 00:26:33 +0000
commitd1aa852e6df52eaca4da775a3c40b3c1c8431008 (patch)
tree312f0c8f255ad6e0fe56253b3319e574fc20a801 /sync
parent2eaed24e86bdb6fb9bbe5d63d88a4692402e31aa (diff)
downloadchromium_src-d1aa852e6df52eaca4da775a3c40b3c1c8431008.zip
chromium_src-d1aa852e6df52eaca4da775a3c40b3c1c8431008.tar.gz
chromium_src-d1aa852e6df52eaca4da775a3c40b3c1c8431008.tar.bz2
[Extensions] Sync the 'allowed scripting on all urls' preference
Sync the flag for whether or not an extension is allowed to script on all urls, independent of the flag to enable the feature. This (eventually) allows people to install extensions on a machine with the flag without the scary warning about what will happen if it's synced. BUG=452756 Review URL: https://codereview.chromium.org/907533004 Cr-Commit-Position: refs/heads/master@{#316100}
Diffstat (limited to 'sync')
-rw-r--r--sync/protocol/extension_specifics.proto6
-rw-r--r--sync/protocol/proto_value_conversions.cc1
2 files changed, 7 insertions, 0 deletions
diff --git a/sync/protocol/extension_specifics.proto b/sync/protocol/extension_specifics.proto
index 2ef3f25..8e724a3 100644
--- a/sync/protocol/extension_specifics.proto
+++ b/sync/protocol/extension_specifics.proto
@@ -42,5 +42,11 @@ message ExtensionSpecifics {
// Whether this extension was installed by the custodian of a supervised user.
optional bool installed_by_custodian = 8;
+
+ // Whether this extension has explicit user consent access to all urls.
+ // This is a tri-state boolean, so, unlike most fields here, it really *is*
+ // optional and may be absent. We need this for the time being because we need
+ // to know if a user has not set an explicit preference.
+ optional bool all_urls_enabled = 9;
}
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 54f0e03..173ebc9 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -460,6 +460,7 @@ base::DictionaryValue* ExtensionSpecificsToValue(
SET_BOOL(incognito_enabled);
SET_BOOL(remote_install);
SET_BOOL(installed_by_custodian);
+ SET_BOOL(all_urls_enabled);
SET_STR(name);
return value;
}