Only allow enabling of ManagePasswordsBubble if USE_AURA or WIN_OS is defined

chrome/browser/password_manager/password_manager.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/password_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 347 matching lines @@
 
   // Looks like a successful login attempt. Either show an infobar or
   // automatically save the login data. We prompt when the user hasn't already
   // given consent, either through previously accepting the infobar or by having
   // the browser generate the password.
   provisional_save_manager_->SubmitPassed();
   if (provisional_save_manager_->HasGeneratedPassword())
     UMA_HISTOGRAM_COUNTS("PasswordGeneration.Submitted", 1);
 
   if (ShouldShowSavePasswordInfoBar()) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
+    #if defined(USE_AURA)

[markusheintz_, 2013/12/18 09:32:54]

I guess this could be USE_AURA or OS_WIN.

[npentrel, 2013/12/18 13:28:47]

Done.

+      NotifyPasswordObserver(PasswordObserver::SAVE_NEW_PASSWORD,
+                             provisional_save_manager_->best_matches(),
+                             provisional_save_manager_->pending_credentials());
+    #else
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSavePasswordBubble)) {
       NotifyPasswordObserver(PasswordObserver::SAVE_NEW_PASSWORD,
                              provisional_save_manager_->best_matches(),
                              provisional_save_manager_->pending_credentials());
-    } else {
-      delegate_->AddSavePasswordInfoBarIfPermitted(
-          provisional_save_manager_.release());
-    }
+      } else {
+        delegate_->AddSavePasswordInfoBarIfPermitted(
+            provisional_save_manager_.release());
+      }
+    #endif
   } else {
     provisional_save_manager_->Save();
     provisional_save_manager_.reset();
   }
 }
 
 void PasswordManager::PossiblyInitializeUsernamesExperiment(
     const PasswordFormMap& best_matches) const {
   if (base::FieldTrialList::Find(kOtherPossibleUsernamesExperiment))
     return;
@@ skipping 57 matching lines @@
     }
     default:
       FOR_EACH_OBSERVER(
           LoginModelObserver,
           observers_,
           OnAutofillDataAvailable(preferred_match.username_value,
                                   preferred_match.password_value));
       break;
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableSavePasswordBubble)) {
+  #if defined(USE_AURA)

[markusheintz_, 2013/12/18 09:32:54]

Same as above

[npentrel, 2013/12/18 13:28:47]

Done.

     NotifyPasswordObserver(PasswordObserver::AUTOFILL_PASSWORDS, best_matches,
                            form_for_autofill);
-  }
+  #else
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableSavePasswordBubble)) {
+      NotifyPasswordObserver(PasswordObserver::AUTOFILL_PASSWORDS, best_matches,
+                             form_for_autofill);
+    }
+  #endif
 }
 
 void PasswordManager::UpdateBestMatches(
     const autofill::PasswordForm& password_form) {
   update_best_matches_password_form_manager_.reset(
       new PasswordFormManager(delegate_->GetProfile(),
                               this,
                               web_contents(),
                               password_form,
                               true));
   update_best_matches_password_form_manager_->
       FetchMatchingLoginsFromPasswordStoreForBubble();
 }
 
 void PasswordManager::SendBestMatchesToManagePasswordsBubble(
     const PasswordFormMap& best_matches) const {
   NotifyPasswordObserverUpdatePasswords(best_matches);
 }