OneClickSigninHelper::CanOffer checks IsEnableWebBasedSignin

chrome/browser/password_manager/save_password_infobar_delegate.cc

 // Copyright 2014 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/save_password_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
+#include "chrome/common/profile_management_switches.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
 void SavePasswordInfoBarDelegate::Create(
     content::WebContents* web_contents,
     PasswordFormManager* form_to_save,
     const std::string& uma_histogram_suffix) {
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   // Don't show the password manager infobar if this form is for a google
   // account and we are going to show the one-click signin infobar.
   GURL realm(form_to_save->realm());
   // TODO(mathp): Checking only against associated_username() causes a bug
   // referenced here: crbug.com/133275
+  // TODO(vabr): The check IsEnableWebBasedSignin is a hack for the time when
+  // OneClickSignin is disabled. http://crbug.com/339804
   if (((realm == GaiaUrls::GetInstance()->gaia_login_form_realm()) ||
        (realm == GURL("https://www.google.com/"))) &&
+      switches::IsEnableWebBasedSignin() &&
       OneClickSigninHelper::CanOffer(
-          web_contents, OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
-          base::UTF16ToUTF8(form_to_save->associated_username()), NULL))
+          web_contents,
+          OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
+          base::UTF16ToUTF8(form_to_save->associated_username()),
+          NULL))
     return;
 #endif
 
   InfoBarService::FromWebContents(web_contents)->AddInfoBar(
       SavePasswordInfoBarDelegate::CreateInfoBar(
           scoped_ptr<SavePasswordInfoBarDelegate>(
               new SavePasswordInfoBarDelegate(form_to_save,
                                               uma_histogram_suffix))));
 }
 
@@ skipping 94 matching lines @@
 
 void SavePasswordInfoBarDelegate::InfoBarDismissed() {
   DCHECK(form_to_save_.get());
   infobar_response_ = INFOBAR_DISMISSED;
 }
 
 InfoBarDelegate::InfoBarAutomationType
     SavePasswordInfoBarDelegate::GetInfoBarAutomationType() const {
   return PASSWORD_INFOBAR;
 }