chrome/browser/extensions/crx_installer.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/crx_installer.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: 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:

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

Download patch

Index: chrome/browser/extensions/crx_installer.cc

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

index 9823d4ee82da418992d0892d0b6e33a811c30223..5dd139eb0d7f3db4e546cc0fd1a982da9c144b2a 100644

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

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

@@ -37,6 +37,8 @@

#include "chrome/common/chrome_paths.h"

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

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

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

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

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

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

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

@@ -55,9 +57,7 @@

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

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

#include "extensions/common/user_script.h"

-#include "grit/chromium_strings.h"

#include "grit/extensions_strings.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

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

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

« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »