chrome/common/extensions/extension.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/common/extensions/extension.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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/common/extensions/extension.cc

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc

index 7e4cf40aa8a10548254366ea50ee973461059475..80109211678c9f23e2f03358d1ee661003e0df61 100644

--- a/chrome/common/extensions/extension.cc

+++ b/chrome/common/extensions/extension.cc

@@ -45,7 +45,7 @@

#include "googleurl/src/url_util.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

-#include "grit/theme_resources_standard.h"

+#include "grit/theme_resources.h"

#include "net/base/registry_controlled_domain.h"

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

#include "ui/base/keycodes/keyboard_codes.h"