content/shell/common/shell_content_client.cc - Issue 486573002: Move webkit resources over to content.

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: content/shell/common/shell_content_client.cc

Issue 486573002: Move webkit resources over to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rm the build files from webkit/glue/resources 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: content/shell/common/shell_content_client.cc

diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc

index 6afa6b974c37c666cf84d4d0fd88acfd7ed8a54e..e951aed999bb032a455e8e501804207420875de2 100644

--- a/content/shell/common/shell_content_client.cc

+++ b/content/shell/common/shell_content_client.cc

@@ -7,12 +7,12 @@

#include "base/command_line.h"

#include "base/strings/string_piece.h"

#include "base/strings/utf_string_conversions.h"

+#include "content/app/resources/grit/content_resources.h"

#include "content/app/strings/grit/content_strings.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/user_agent.h"

#include "content/shell/common/shell_switches.h"

#include "grit/shell_resources.h"

-#include "grit/webkit_resources.h"

#include "ui/base/l10n/l10n_util.h"

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