chrome/browser/extensions/component_loader.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/component_loader.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/bundle_installer.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | chrome/browser/password_manager/password_manager_util_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

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

index ec60802104249ce97a4f7f81436f4119d4924d87..92f3c9f69e500307e4834c7b55f648108fc2f474 100644

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

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

@@ -17,6 +17,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/extensions/extension_constants.h"

+#include "chrome/grit/generated_resources.h"

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

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

#include "extensions/common/extension.h"

@@ -24,7 +25,6 @@

#include "extensions/common/id_util.h"

#include "extensions/common/manifest_constants.h"

#include "grit/browser_resources.h"

-#include "grit/generated_resources.h"

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

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

@@ -49,7 +49,7 @@

#endif

#if defined(ENABLE_APP_LIST)

-#include "grit/chromium_strings.h"

+#include "chrome/grit/chromium_strings.h"

#endif

using content::BrowserThread;