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

diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc

index d3ed10d9239e1b13e026f2ba98b4a7d1c19148d6..81b2c6670c8f92deaf05cf5067846753f6acb13f 100644

--- a/chrome/browser/prefs/chrome_pref_service_factory.cc

+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc

@@ -38,6 +38,8 @@

#include "chrome/browser/ui/profile_error_dialog.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/pref_names.h"

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

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

#include "components/pref_registry/pref_registry_syncable.h"

#include "components/search_engines/default_search_manager.h"

#include "components/search_engines/search_engines_pref_names.h"

@@ -45,8 +47,6 @@

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

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

#include "grit/browser_resources.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "sync/internal_api/public/base/model_type.h"

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

« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »