Make sure password manager does not display at the same time as one-click on

chrome/browser/password_manager_delegate_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager_delegate_impl.h"
 
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
@@ skipping 115 matching lines @@
   tab_contents_->web_contents()->GetRenderViewHost()->Send(
       new AutofillMsg_FillPasswordForm(
           tab_contents_->web_contents()->GetRenderViewHost()->GetRoutingID(),
           form_data));
 }
 
 void PasswordManagerDelegateImpl::AddSavePasswordInfoBarIfPermitted(
     PasswordFormManager* form_to_save) {
   // Don't show the password manager infobar if this form is for a google
   // account and we are going to show the one-click singin infobar.
-  // For now, one-click signin is fully implemented only on windows.  When
-  // the feature is finally implemented on mac and linux, will need to add
-  // OS_MACOSX and OS_LINUX.
-#if defined(OS_WIN)
+  // For now, one-click signin is fully implemented only on windows.
+#if defined(ENABLE_ONE_CLICK_SIGNIN)
   GURL realm(form_to_save->realm());
   if (realm == GURL(GaiaUrls::GetInstance()->gaia_login_form_realm()) &&
       OneClickSigninHelper::CanOffer(tab_contents_->web_contents(), true)) {
     return;
   }
 #endif
 
   tab_contents_->infobar_tab_helper()->AddInfoBar(
       new SavePasswordInfoBarDelegate(
           tab_contents_->infobar_tab_helper(), form_to_save));
 }
 
 Profile* PasswordManagerDelegateImpl::GetProfileForPasswordManager() {
   return tab_contents_->profile();
 }
 
 bool PasswordManagerDelegateImpl::DidLastPageLoadEncounterSSLErrors() {
   content::NavigationEntry* entry =
       tab_contents_->web_contents()->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return false;
   }
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }