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

Unified Diff: chrome/browser/profiles/profile_window.cc

Issue 323133005: Enable consistent identity on android platform by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 6 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/profiles/profile_window.cc
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index ffb84064a218d0a860c168d551c6e14e8d81d002..1b52daa5a9485c5310493add0be105b251a5639e 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -23,6 +23,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "components/signin/core/browser/account_reconcilor.h"
+#include "components/signin/core/common/profile_management_switches.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/user_metrics.h"
@@ -317,6 +318,9 @@ void ShowUserManagerMaybeWithTutorial(Profile* profile) {
}
void EnableNewProfileManagementPreview(Profile* profile) {
+#if defined(OS_ANDROID)
+ NOTREACHED();
+#else
about_flags::PrefServiceFlagsStorage flags_storage(
g_browser_process->local_state());
about_flags::SetExperimentEnabled(
@@ -324,10 +328,11 @@ void EnableNewProfileManagementPreview(Profile* profile) {
kNewProfileManagementExperimentInternalName,
true);
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
chrome::ShowUserManagerWithTutorial(profiles::USER_MANAGER_TUTORIAL_OVERVIEW);
UpdateServicesWithNewProfileManagementFlag(profile, true);
+#endif
}
void DisableNewProfileManagementPreview(Profile* profile) {
« no previous file with comments | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chrome/browser/signin/account_reconcilor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698