Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / signin / chrome_signin_client.cc

diff --git a/src/chrome/browser/signin/chrome_signin_client.cc b/src/chrome/browser/signin/chrome_signin_client.cc
index 1d7449a..4586146 100644 (file)
--- a/src/chrome/browser/signin/chrome_signin_client.cc
+++ b/src/chrome/browser/signin/chrome_signin_client.cc
@@ -204,11 +204,12 @@ ChromeSigninClient::AddCookieChangedCallback(
   return subscription.Pass();
 }
 
-void ChromeSigninClient::GoogleSigninSucceeded(const std::string& username,
+void ChromeSigninClient::GoogleSigninSucceeded(const std::string& account_id,
+                                               const std::string& username,
                                                const std::string& password) {
-#if !defined(OS_ANDROID)
-  // Don't store password hash except for users of account consistency features.
-  if (switches::IsEnableAccountConsistency())
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
+  // Don't store password hash except for users of new profile management.
+  if (switches::IsNewProfileManagement())
     chrome::SetLocalAuthCredentials(profile_, password);
 #endif
 }