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

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

index 3d78bae798fa82d9e7e6da42c57cb62949ae6b40..e01c27d157daef9c0e2bc0f030fe53a94986ac99 100644

--- a/chrome/browser/character_encoding.cc

+++ b/chrome/browser/character_encoding.cc

@@ -13,8 +13,8 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

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

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

-#include "grit/generated_resources.h"

#include "third_party/icu/source/common/unicode/ucnv.h"

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

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

« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »