Android: Allow compiling browser without Java UI

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
index d6903dde75926e710c2670557155fbbd73e4c17e..e6dba755f0a53570b92077b60089dd264c9279db 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -25,7 +25,7 @@
 #include "content/public/browser/navigation_details.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "chrome/browser/android/chrome_application.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/account_chooser_dialog_android.h"
@@ -74,7 +74,7 @@ void ManagePasswordsUIController::UpdateBubbleAndIconVisibility() {
     passwords_data_.OnInactive();
   }
 
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser)
     return;
@@ -86,7 +86,7 @@ void ManagePasswordsUIController::UpdateBubbleAndIconVisibility() {
 
 void ManagePasswordsUIController::
     UpdateAndroidAccountChooserInfoBarVisibility() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   // Deletes itself on the event from Java counterpart, when user interacts with
   // dialog.
   AccountChooserDialogAndroid* acccount_chooser_dialog =
@@ -127,7 +127,7 @@ bool ManagePasswordsUIController::OnChooseCredentials(
                                        federated_credentials.Pass(),
                                        origin);
   base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   UpdateAndroidAccountChooserInfoBarVisibility();
 #else
   UpdateBubbleAndIconVisibility();
@@ -181,7 +181,7 @@ void ManagePasswordsUIController::OnLoginsChanged(
 }
 
 void ManagePasswordsUIController::NavigateToPasswordManagerSettingsPage() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   chrome::android::ChromeApplication::ShowPasswordSettings();
 #else
   chrome::ShowSettingsSubPage(
@@ -191,7 +191,7 @@ void ManagePasswordsUIController::NavigateToPasswordManagerSettingsPage() {
 }
 
 void ManagePasswordsUIController::NavigateToExternalPasswordManager() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   NOTREACHED();
 #else
   chrome::NavigateParams params(
@@ -204,7 +204,7 @@ void ManagePasswordsUIController::NavigateToExternalPasswordManager() {
 }
 
 void ManagePasswordsUIController::NavigateToSmartLockPage() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   NOTREACHED();
 #else
   chrome::NavigateParams params(
@@ -217,7 +217,7 @@ void ManagePasswordsUIController::NavigateToSmartLockPage() {
 }
 
 void ManagePasswordsUIController::NavigateToSmartLockHelpPage() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   NOTREACHED();
 #else
   chrome::NavigateParams params(
@@ -303,7 +303,7 @@ void ManagePasswordsUIController::DidNavigateMainFrame(
 }
 
 void ManagePasswordsUIController::WasHidden() {
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
   TabDialogs::FromWebContents(web_contents())->HideManagePasswordsBubble();
 #endif
 }
@@ -328,7 +328,7 @@ bool ManagePasswordsUIController::PasswordOverridden() const {
   return form_manager ? form_manager->password_overridden() : false;
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
 void ManagePasswordsUIController::UpdateIconAndBubbleState(
     ManagePasswordsIconView* icon) {
   if (should_pop_up_bubble_) {
@@ -381,7 +381,7 @@ password_manager::ui::State ManagePasswordsUIController::state() const {
 
 void ManagePasswordsUIController::ShowBubbleWithoutUserInteraction() {
   DCHECK(should_pop_up_bubble_);
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser || browser->toolbar_model()->input_in_progress())
     return;