X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcomponents%2Fpassword_manager%2Fcore%2Fbrowser%2Fpassword_generation_manager.cc;h=18e119a846dc21315eebd406e1067e384a783161;hb=refs%2Fchanges%2F05%2F32605%2F1;hp=75499c8503c8ee95f24c2c6ec0fc267fac819c9d;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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;
   }