| Index: chrome/browser/extensions/extension_sync_data.cc
|
| diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc
|
| index 016f46e13d4f85feee5efcd24024004fc3ec72dc..aaf1244edf44c107948f1a6de1dab4ea3a3ee273 100644
|
| --- a/chrome/browser/extensions/extension_sync_data.cc
|
| +++ b/chrome/browser/extensions/extension_sync_data.cc
|
| @@ -18,31 +18,36 @@ namespace extensions {
|
| ExtensionSyncData::ExtensionSyncData()
|
| : uninstalled_(false),
|
| enabled_(false),
|
| - incognito_enabled_(false) {
|
| + incognito_enabled_(false),
|
| + remote_install_(false) {
|
| }
|
|
|
| ExtensionSyncData::ExtensionSyncData(const syncer::SyncData& sync_data)
|
| : uninstalled_(false),
|
| enabled_(false),
|
| - incognito_enabled_(false) {
|
| + incognito_enabled_(false),
|
| + remote_install_(false) {
|
| PopulateFromSyncData(sync_data);
|
| }
|
|
|
| ExtensionSyncData::ExtensionSyncData(const syncer::SyncChange& sync_change)
|
| - : uninstalled_(
|
| - sync_change.change_type() == syncer::SyncChange::ACTION_DELETE),
|
| + : uninstalled_(sync_change.change_type() ==
|
| + syncer::SyncChange::ACTION_DELETE),
|
| enabled_(false),
|
| - incognito_enabled_(false) {
|
| + incognito_enabled_(false),
|
| + remote_install_(false) {
|
| PopulateFromSyncData(sync_change.sync_data());
|
| }
|
|
|
| ExtensionSyncData::ExtensionSyncData(const Extension& extension,
|
| bool enabled,
|
| - bool incognito_enabled)
|
| - : id_(extension.id()),
|
| + bool incognito_enabled,
|
| + bool remote_install)
|
| + : id_(extension.id()),
|
| uninstalled_(false),
|
| enabled_(enabled),
|
| incognito_enabled_(incognito_enabled),
|
| + remote_install_(remote_install),
|
| version_(extension.from_bookmark() ? base::Version("0")
|
| : *extension.version()),
|
| update_url_(ManifestURL::GetUpdateURL(&extension)),
|
| @@ -71,6 +76,7 @@ void ExtensionSyncData::PopulateExtensionSpecifics(
|
| specifics->set_version(version_.GetString());
|
| specifics->set_enabled(enabled_);
|
| specifics->set_incognito_enabled(incognito_enabled_);
|
| + specifics->set_remote_install(remote_install_);
|
| specifics->set_name(name_);
|
| }
|
|
|
| @@ -95,6 +101,7 @@ void ExtensionSyncData::PopulateFromExtensionSpecifics(
|
| version_ = specifics_version;
|
| enabled_ = specifics.enabled();
|
| incognito_enabled_ = specifics.incognito_enabled();
|
| + remote_install_ = specifics.remote_install();
|
| name_ = specifics.name();
|
| }
|
|
|
|
|