Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side 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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 password_manager::PasswordManager::RegisterProfilePrefs(registry); 374 password_manager::PasswordManager::RegisterProfilePrefs(registry);
375 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 375 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
376 PrefsTabHelper::RegisterProfilePrefs(registry); 376 PrefsTabHelper::RegisterProfilePrefs(registry);
377 Profile::RegisterProfilePrefs(registry); 377 Profile::RegisterProfilePrefs(registry);
378 ProfileImpl::RegisterProfilePrefs(registry); 378 ProfileImpl::RegisterProfilePrefs(registry);
379 PromoResourceService::RegisterProfilePrefs(registry); 379 PromoResourceService::RegisterProfilePrefs(registry);
380 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 380 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
381 RegisterBrowserUserPrefs(registry); 381 RegisterBrowserUserPrefs(registry);
382 SessionStartupPref::RegisterProfilePrefs(registry); 382 SessionStartupPref::RegisterProfilePrefs(registry);
383 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 383 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
384 TranslatePrefs::RegisterProfilePrefs(registry); 384 translate::TranslatePrefs::RegisterProfilePrefs(registry);
385 ZeroSuggestProvider::RegisterProfilePrefs(registry); 385 ZeroSuggestProvider::RegisterProfilePrefs(registry);
386 386
387 #if defined(ENABLE_AUTOFILL_DIALOG) 387 #if defined(ENABLE_AUTOFILL_DIALOG)
388 autofill::AutofillDialogController::RegisterProfilePrefs(registry); 388 autofill::AutofillDialogController::RegisterProfilePrefs(registry);
389 #endif 389 #endif
390 390
391 #if defined(ENABLE_CONFIGURATION_POLICY) 391 #if defined(ENABLE_CONFIGURATION_POLICY)
392 policy::URLBlacklistManager::RegisterProfilePrefs(registry); 392 policy::URLBlacklistManager::RegisterProfilePrefs(registry);
393 #endif 393 #endif
394 394
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 // Cleanup prefs from now-removed protector feature. 516 // Cleanup prefs from now-removed protector feature.
517 prefs->ClearPref(kBackupPref); 517 prefs->ClearPref(kBackupPref);
518 518
519 #if !defined(OS_ANDROID) 519 #if !defined(OS_ANDROID)
520 // Cleanup now-removed sync promo error message preference. 520 // Cleanup now-removed sync promo error message preference.
521 // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442). 521 // TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442).
522 prefs->ClearPref(kSyncPromoErrorMessage); 522 prefs->ClearPref(kSyncPromoErrorMessage);
523 #endif 523 #endif
524 524
525 PromoResourceService::MigrateUserPrefs(prefs); 525 PromoResourceService::MigrateUserPrefs(prefs);
526 TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages); 526 translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);
527 527
528 #if defined(OS_MACOSX) && !defined(OS_IOS) 528 #if defined(OS_MACOSX) && !defined(OS_IOS)
529 autofill::AutofillManager::MigrateUserPrefs(prefs); 529 autofill::AutofillManager::MigrateUserPrefs(prefs);
530 #endif // defined(OS_MACOSX) && !defined(OS_IOS) 530 #endif // defined(OS_MACOSX) && !defined(OS_IOS)
531 } 531 }
532 532
533 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { 533 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
534 // Copy pref values which have been migrated to user_prefs from local_state, 534 // Copy pref values which have been migrated to user_prefs from local_state,
535 // or remove them from local_state outright, if copying is not required. 535 // or remove them from local_state outright, if copying is not required.
536 int current_version = 536 int current_version =
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 #if defined(OS_CHROMEOS) 593 #if defined(OS_CHROMEOS)
594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
595 #endif 595 #endif
596 596
597 #if defined(TOOLKIT_VIEWS) 597 #if defined(TOOLKIT_VIEWS)
598 MigrateBrowserTabStripPrefs(local_state); 598 MigrateBrowserTabStripPrefs(local_state);
599 #endif 599 #endif
600 } 600 }
601 601
602 } // namespace chrome 602 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/renderer_context_menu/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698