| Index: chrome/browser/extensions/app_sync_data.cc
|
| diff --git a/chrome/browser/extensions/app_sync_data.cc b/chrome/browser/extensions/app_sync_data.cc
|
| index 1ecbb24cc96a705849ad499ef43fc00b214a6980..6ee99da3ae6510396145ad0671cfea524eeca4b9 100644
|
| --- a/chrome/browser/extensions/app_sync_data.cc
|
| +++ b/chrome/browser/extensions/app_sync_data.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/extensions/app_sync_data.h"
|
|
|
| +#include "chrome/common/extensions/manifest_handlers/app_icon_color_info.h"
|
| #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
|
| #include "extensions/common/extension.h"
|
| #include "sync/api/sync_data.h"
|
| @@ -41,6 +42,7 @@ AppSyncData::AppSyncData(const Extension& extension,
|
| if (extension.from_bookmark()) {
|
| bookmark_app_description_ = extension.description();
|
| bookmark_app_url_ = AppLaunchInfo::GetLaunchWebURL(&extension).spec();
|
| + bookmark_app_icon_color_ = AppIconColorInfo::GetIconColorString(&extension);
|
| }
|
| }
|
|
|
| @@ -84,6 +86,9 @@ void AppSyncData::PopulateAppSpecifics(sync_pb::AppSpecifics* specifics) const {
|
| if (!bookmark_app_description_.empty())
|
| specifics->set_bookmark_app_description(bookmark_app_description_);
|
|
|
| + if (!bookmark_app_icon_color_.empty())
|
| + specifics->set_bookmark_app_icon_color(bookmark_app_icon_color_);
|
| +
|
| extension_sync_data_.PopulateExtensionSpecifics(
|
| specifics->mutable_extension());
|
| }
|
| @@ -101,6 +106,7 @@ void AppSyncData::PopulateFromAppSpecifics(
|
|
|
| bookmark_app_url_ = specifics.bookmark_app_url();
|
| bookmark_app_description_ = specifics.bookmark_app_description();
|
| + bookmark_app_icon_color_ = specifics.bookmark_app_icon_color();
|
| }
|
|
|
| void AppSyncData::PopulateFromSyncData(const syncer::SyncData& sync_data) {
|
|
|