chrome/browser/web_applications/web_app.cc - Issue 535373002: Move extension/app default icon into src/extensions

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/web_applications/web_app.cc

Issue 535373002: Move extension/app default icon into src/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: icon_image Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/web_applications/web_app.cc

diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc

index e90433054d7cfde737988aada41fa2b71464a875..02f227757f62472cfa2c8f8db8486b616c9af242 100644

--- a/chrome/browser/web_applications/web_app.cc

+++ b/chrome/browser/web_applications/web_app.cc

@@ -25,7 +25,7 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

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

-#include "grit/theme_resources.h"

+#include "extensions/grit/extensions_browser_resources.h"

#include "skia/ext/image_operations.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/resource/resource_bundle.h"