chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.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/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index d81d481db1de0c4e29e030539c4dd861867c142f..2b2296228b8d7094a36622a9306a02ffb97b78fd 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -127,7 +127,6 @@

#include "extensions/common/permissions/socket_permission.h"

#include "extensions/common/switches.h"

#include "grit/generated_resources.h"

-#include "grit/ui_resources.h"

#include "net/base/mime_util.h"

#include "net/cookies/canonical_cookie.h"

#include "net/cookies/cookie_options.h"

@@ -136,6 +135,7 @@

#include "ppapi/shared_impl/ppapi_switches.h"

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

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

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

#include "webkit/browser/fileapi/external_mount_points.h"

#if defined(OS_WIN)