chrome/browser/extensions/extension_sync_service.cc - Issue 782693002: Ensure there are always nice icons for bookmark apps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_sync_service.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: Self review; test 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

« chrome/browser/extensions/bookmark_app_helper.cc ('K') | « chrome/browser/extensions/convert_web_app.cc ('k') | chrome/chrome_common.gypi » ('j') | chrome/common/extensions/manifest_handlers/app_icon_color_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_sync_service.cc

diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc

index 895da0236f2d940e0a45e5ac8da915a81f9e6ada..8b0a197c0416965eaa056f1f3d555e8f8fc68067 100644

--- a/chrome/browser/extensions/extension_sync_service.cc

+++ b/chrome/browser/extensions/extension_sync_service.cc

@@ -32,6 +32,7 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_icon_set.h"

#include "extensions/common/feature_switch.h"

+#include "extensions/common/image_util.h"

#include "extensions/common/manifest_constants.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

#include "sync/api/sync_change.h"

@@ -388,6 +389,11 @@ void ExtensionSyncService::ProcessBookmarkAppSyncData(

base::UTF8ToUTF16(app_sync_data.extension_sync_data().name());

web_app_info.description =

base::UTF8ToUTF16(app_sync_data.bookmark_app_description());

+ if (!app_sync_data.bookmark_app_icon_color().empty()) {

+ extensions::image_util::ParseCSSColorString(

+ app_sync_data.bookmark_app_icon_color(),

+ &web_app_info.generated_icon_color);

+ }

// If the bookmark app already exists, keep the old icons.

if (!extension) {