chrome/browser/extensions/extension_action.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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_action.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 4 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/extensions/extension_action.cc

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

index ddf8d4f080d78a1af85f17ada06ef36abcd1c388..78934f4c59e6877d0ecce22cf8a683a5b718ccab 100644

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

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

@@ -13,7 +13,6 @@

#include "chrome/common/icon_with_badge_image_source.h"

#include "extensions/common/constants.h"

#include "grit/theme_resources.h"

-#include "grit/ui_resources.h"

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

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

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

@@ -28,6 +27,7 @@

#include "ui/gfx/rect.h"

#include "ui/gfx/size.h"

#include "ui/gfx/skbitmap_operations.h"

+#include "ui/resources/grit/ui_resources.h"

#include "url/gurl.h"

namespace {