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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 1148203002: Fix crash when logging in with an open uber page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 500? Created 5 years, 7 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/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 6b9fb39b635aa55da3bb6c2e0849ecce4ccc03fd..8053a30a108e87791d7a13054d285f5198ccc41f 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -153,6 +153,7 @@
#if !defined(OS_ANDROID) && !defined(OS_IOS)
#include "chrome/browser/signin/signin_promo.h"
+#include "chrome/browser/ui/webui/foreign_session_handler.h"
#endif
#if defined(OS_CHROMEOS)
@@ -511,6 +512,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#if defined(USE_ASH)
ash::RegisterChromeLauncherUserPrefs(registry);
#endif
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+ browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
Dan Beam 2015/05/20 18:40:02 registering here avoids accidental double registra
+#endif
}
void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
« no previous file with comments | « no previous file | chrome/browser/ui/webui/foreign_session_handler.h » ('j') | chrome/browser/ui/webui/foreign_session_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698