chrome/browser/ui/apps/chrome_app_delegate.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/ui/apps/chrome_app_delegate.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/ui/apps/chrome_app_delegate.cc

diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc

index d3b5345048abcbf2292fbe2a8ac120ed021567a7..ace97d0134d7ea318d133759275886d383b95672 100644

--- a/chrome/browser/ui/apps/chrome_app_delegate.cc

+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -27,7 +27,7 @@

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_delegate.h"

#include "extensions/common/constants.h"

-#include "grit/theme_resources.h"

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

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

#if defined(USE_ASH)