Don't compile save_password_infobar_delegate.cc everywhere but Mac and Android

chrome/browser/password_manager/chrome_password_manager_client.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/chrome_password_manager_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
-#include "chrome/browser/password_manager/save_password_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_controller_impl.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
@@ skipping 16 matching lines @@
 #include "components/password_manager/sync/browser/password_sync_util.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "third_party/re2/re2/re2.h"
 
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#include "chrome/browser/password_manager/save_password_infobar_delegate.h"
+#endif
+
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.h"
 #include "chrome/browser/ui/android/snackbars/auto_signin_snackbar_controller.h"
 #endif
 
 using password_manager::ContentPasswordManagerDriverFactory;
 using password_manager::PasswordManagerInternalsService;
 using password_manager::PasswordManagerInternalsServiceFactory;
 
@@ skipping 147 matching lines @@
   if (IsTheHotNewBubbleUIEnabled()) {
     ManagePasswordsUIController* manage_passwords_ui_controller =
         ManagePasswordsUIController::FromWebContents(web_contents());
     if (update_password && IsUpdatePasswordUIEnabled()) {
       manage_passwords_ui_controller->OnUpdatePasswordSubmitted(
           form_to_save.Pass());
     } else {
       manage_passwords_ui_controller->OnPasswordSubmitted(form_to_save.Pass());
     }
   } else {
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
     if (form_to_save->IsBlacklisted())
       return false;
     std::string uma_histogram_suffix(
         password_manager::metrics_util::GroupIdToString(
             password_manager::metrics_util::MonitoredDomainGroupId(
                 form_to_save->pending_credentials().signon_realm, GetPrefs())));
     SavePasswordInfoBarDelegate::Create(
         web_contents(), form_to_save.Pass(), uma_histogram_suffix, type);
+#else
+    NOTREACHED() << "Aura platforms should always use the bubble";
+#endif
   }
   return true;
 }
 
 bool ChromePasswordManagerClient::PromptUserToChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_forms,
     ScopedVector<autofill::PasswordForm> federated_forms,
     const GURL& origin,
     base::Callback<void(const password_manager::CredentialInfo&)> callback) {
   return ManagePasswordsUIController::FromWebContents(web_contents())->
@@ skipping 262 matching lines @@
     return false;
 
   // All password sites, including test sites, have autofilling disabled.
   CR_DEFINE_STATIC_LOCAL(RE2, account_dashboard_pattern,
                          ("passwords(-([a-z-]+\\.corp))?\\.google\\.com"));
 
   return RE2::FullMatch(GURL(param_value).host(), account_dashboard_pattern);
 }
 
 bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
-#if !defined(USE_AURA) && !defined(OS_MACOSX)
-  return false;
-#endif
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableSavePasswordBubble))
+  if (command_line->HasSwitch(switches::kDisableSavePasswordBubble)) {

[vabr (Chromium), 2015/09/10 07:21:47]

nit: Drop the { and }, for on-liner "if" it is not needed, and dropping it is
locally consistent with the rest of the file.

[ki.stfu, 2015/09/10 18:21:00]

Done.

     return false;
+  }
 
   if (command_line->HasSwitch(switches::kEnableSavePasswordBubble))
     return true;
 
   std::string group_name =
       base::FieldTrialList::FindFullName("PasswordManagerUI");
 
   // The bubble should be the default case that runs on the bots.
   return group_name != "Infobar";
+#else
+  // All other platforms use Aura, and therefore always show the bubble.
+  return true;
+#endif
 }
 
 bool ChromePasswordManagerClient::IsUpdatePasswordUIEnabled() const {
 #if defined(OS_MACOSX)
   return false;
 #else
   return IsTheHotNewBubbleUIEnabled();
 #endif
 }
 
@@ skipping 24 matching lines @@
   if (!entry)
     return GURL::EmptyGURL();
 
   return entry->GetURL();
 }
 
 const password_manager::CredentialsFilter*
 ChromePasswordManagerClient::GetStoreResultFilter() const {
   return &credentials_filter_;
 }