Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5494)

Unified Diff: chrome/browser/extensions/app_sync_data.cc

Issue 782693002: Ensure there are always nice icons for bookmark apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac compile Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/app_sync_data.h ('k') | chrome/browser/extensions/bookmark_app_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « chrome/browser/extensions/app_sync_data.h ('k') | chrome/browser/extensions/bookmark_app_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698