Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / password_manager / core / browser / password_generation_manager.cc

diff --git a/src/components/password_manager/core/browser/password_generation_manager.cc b/src/components/password_manager/core/browser/password_generation_manager.cc
index 75499c8..18e119a 100644 (file)
--- a/src/components/password_manager/core/browser/password_generation_manager.cc
+++ b/src/components/password_manager/core/browser/password_generation_manager.cc
@@ -49,8 +49,11 @@ bool PasswordGenerationManager::IsGenerationEnabled() const {
     return false;
   }
 
-  if (!client_->IsPasswordSyncEnabled()) {
-    DVLOG(2) << "Generation disabled because passwords are not being synced";
+  // Don't consider sync enabled if the user has a custom passphrase. See
+  // crbug.com/358998 for more details.
+  if (!client_->IsPasswordSyncEnabled(WITHOUT_CUSTOM_PASSPHRASE)) {
+    DVLOG(2) << "Generation disabled because passwords are not being synced or"
+             << " custom passphrase is used.";
     return false;
   }