Commit 075b392d authored by mek@chromium.org's avatar mek@chromium.org

Add remote_install flag to extension sync data.

This is the first step in adding support for remote installation of
extensions and apps.

BUG=365737

Review URL: https://codereview.chromium.org/264933005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268053 0039d316-1c4b-4281-b951-d872f2087c98
parent 8f2abb48
...@@ -28,6 +28,7 @@ class AppSyncDataTest : public testing::Test { ...@@ -28,6 +28,7 @@ class AppSyncDataTest : public testing::Test {
extension_specifics->set_version(kValidVersion); extension_specifics->set_version(kValidVersion);
extension_specifics->set_enabled(false); extension_specifics->set_enabled(false);
extension_specifics->set_incognito_enabled(true); extension_specifics->set_incognito_enabled(true);
extension_specifics->set_remote_install(false);
extension_specifics->set_name(kName); extension_specifics->set_name(kName);
} }
}; };
......
...@@ -18,13 +18,15 @@ namespace extensions { ...@@ -18,13 +18,15 @@ namespace extensions {
ExtensionSyncData::ExtensionSyncData() ExtensionSyncData::ExtensionSyncData()
: uninstalled_(false), : uninstalled_(false),
enabled_(false), enabled_(false),
incognito_enabled_(false) { incognito_enabled_(false),
remote_install_(false) {
} }
ExtensionSyncData::ExtensionSyncData(const syncer::SyncData& sync_data) ExtensionSyncData::ExtensionSyncData(const syncer::SyncData& sync_data)
: uninstalled_(false), : uninstalled_(false),
enabled_(false), enabled_(false),
incognito_enabled_(false) { incognito_enabled_(false),
remote_install_(false) {
PopulateFromSyncData(sync_data); PopulateFromSyncData(sync_data);
} }
...@@ -32,7 +34,8 @@ ExtensionSyncData::ExtensionSyncData(const syncer::SyncChange& sync_change) ...@@ -32,7 +34,8 @@ ExtensionSyncData::ExtensionSyncData(const syncer::SyncChange& sync_change)
: uninstalled_( : uninstalled_(
sync_change.change_type() == syncer::SyncChange::ACTION_DELETE), sync_change.change_type() == syncer::SyncChange::ACTION_DELETE),
enabled_(false), enabled_(false),
incognito_enabled_(false) { incognito_enabled_(false),
remote_install_(false) {
PopulateFromSyncData(sync_change.sync_data()); PopulateFromSyncData(sync_change.sync_data());
} }
...@@ -43,6 +46,7 @@ ExtensionSyncData::ExtensionSyncData(const Extension& extension, ...@@ -43,6 +46,7 @@ ExtensionSyncData::ExtensionSyncData(const Extension& extension,
uninstalled_(false), uninstalled_(false),
enabled_(enabled), enabled_(enabled),
incognito_enabled_(incognito_enabled), incognito_enabled_(incognito_enabled),
remote_install_(false),
version_(extension.from_bookmark() ? base::Version("0") version_(extension.from_bookmark() ? base::Version("0")
: *extension.version()), : *extension.version()),
update_url_(ManifestURL::GetUpdateURL(&extension)), update_url_(ManifestURL::GetUpdateURL(&extension)),
...@@ -71,6 +75,7 @@ void ExtensionSyncData::PopulateExtensionSpecifics( ...@@ -71,6 +75,7 @@ void ExtensionSyncData::PopulateExtensionSpecifics(
specifics->set_version(version_.GetString()); specifics->set_version(version_.GetString());
specifics->set_enabled(enabled_); specifics->set_enabled(enabled_);
specifics->set_incognito_enabled(incognito_enabled_); specifics->set_incognito_enabled(incognito_enabled_);
specifics->set_remote_install(remote_install_);
specifics->set_name(name_); specifics->set_name(name_);
} }
...@@ -95,6 +100,7 @@ void ExtensionSyncData::PopulateFromExtensionSpecifics( ...@@ -95,6 +100,7 @@ void ExtensionSyncData::PopulateFromExtensionSpecifics(
version_ = specifics_version; version_ = specifics_version;
enabled_ = specifics.enabled(); enabled_ = specifics.enabled();
incognito_enabled_ = specifics.incognito_enabled(); incognito_enabled_ = specifics.incognito_enabled();
remote_install_ = specifics.remote_install();
name_ = specifics.name(); name_ = specifics.name();
} }
......
...@@ -72,6 +72,7 @@ class ExtensionSyncData { ...@@ -72,6 +72,7 @@ class ExtensionSyncData {
bool uninstalled_; bool uninstalled_;
bool enabled_; bool enabled_;
bool incognito_enabled_; bool incognito_enabled_;
bool remote_install_;
Version version_; Version version_;
GURL update_url_; GURL update_url_;
std::string name_; std::string name_;
......
...@@ -35,5 +35,9 @@ message ExtensionSpecifics { ...@@ -35,5 +35,9 @@ message ExtensionSpecifics {
// The name of the extension. Used for bookmark apps. // The name of the extension. Used for bookmark apps.
optional string name = 6; optional string name = 6;
// Whether this extension was installed remotely, and hasn't been approved by
// a user in chrome yet.
optional bool remote_install = 7;
} }
...@@ -549,6 +549,7 @@ base::DictionaryValue* ExtensionSpecificsToValue( ...@@ -549,6 +549,7 @@ base::DictionaryValue* ExtensionSpecificsToValue(
SET_STR(update_url); SET_STR(update_url);
SET_BOOL(enabled); SET_BOOL(enabled);
SET_BOOL(incognito_enabled); SET_BOOL(incognito_enabled);
SET_BOOL(remote_install);
SET_STR(name); SET_STR(name);
return value; return value;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment