Ensure there are always nice icons for bookmark apps.

chrome/browser/extensions/app_sync_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace extensions {
 
 AppSyncData::AppSyncData() {}
 
@@ skipping 17 matching lines @@
     : extension_sync_data_(extension,
                            enabled,
                            incognito_enabled,
                            remote_install),
       app_launch_ordinal_(app_launch_ordinal),
       page_ordinal_(page_ordinal),
       launch_type_(launch_type) {
   if (extension.from_bookmark()) {
     bookmark_app_description_ = extension.description();
     bookmark_app_url_ = AppLaunchInfo::GetLaunchWebURL(&extension).spec();
+    bookmark_app_icon_color_ = AppIconColorInfo::GetIconColorString(&extension);
   }
 }
 
 AppSyncData::~AppSyncData() {}
 
 syncer::SyncData AppSyncData::GetSyncData() const {
   sync_pb::EntitySpecifics specifics;
   PopulateAppSpecifics(specifics.mutable_app());
 
   return syncer::SyncData::CreateLocalData(extension_sync_data_.id(),
@@ skipping 23 matching lines @@
       sync_pb::AppSpecifics_LaunchType_IsValid(sync_launch_type)) {
     specifics->set_launch_type(sync_launch_type);
   }
 
   if (!bookmark_app_url_.empty())
     specifics->set_bookmark_app_url(bookmark_app_url_);
 
   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());
 }
 
 void AppSyncData::PopulateFromAppSpecifics(
     const sync_pb::AppSpecifics& specifics) {
   extension_sync_data_.PopulateFromExtensionSpecifics(specifics.extension());
 
   app_launch_ordinal_ = syncer::StringOrdinal(specifics.app_launch_ordinal());
   page_ordinal_ = syncer::StringOrdinal(specifics.page_ordinal());
 
   launch_type_ = specifics.has_launch_type()
       ? static_cast<extensions::LaunchType>(specifics.launch_type())
       : LAUNCH_TYPE_INVALID;
 
   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) {
   PopulateFromAppSpecifics(sync_data.GetSpecifics().app());
 }
 
 }  // namespace extensions