chrome/browser/prefs/browser_prefs.cc - Issue 378253002: Fix translate namespace

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

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing android build errors Created 6 years, 5 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/prefs/browser_prefs.cc

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

index 611125e81681248c3ef24103adc842ab53cb294b..dfdb4ae803749ec10fec75b5e4367ff65785a5e8 100644

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

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

@@ -381,7 +381,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

RegisterBrowserUserPrefs(registry);

SessionStartupPref::RegisterProfilePrefs(registry);

TemplateURLPrepopulateData::RegisterProfilePrefs(registry);

- TranslatePrefs::RegisterProfilePrefs(registry);

+ translate::TranslatePrefs::RegisterProfilePrefs(registry);

ZeroSuggestProvider::RegisterProfilePrefs(registry);

#if defined(ENABLE_AUTOFILL_DIALOG)

@@ -523,7 +523,7 @@ void MigrateUserPrefs(Profile* profile) {

#endif

PromoResourceService::MigrateUserPrefs(prefs);

- TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);

+ translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);

#if defined(OS_MACOSX) && !defined(OS_IOS)

autofill::AutofillManager::MigrateUserPrefs(prefs);