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 e348ec0a059b2785079defc875271fc831a9ff71..1f2c02924da28e665cecacff40addef95e7f1243 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -26,7 +26,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"
@@ -79,7 +79,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;
@@ -91,7 +91,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 =
@@ -137,7 +137,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();
@@ -298,7 +298,7 @@ void ManagePasswordsUIController::ChooseCredential(
 }
 
 void ManagePasswordsUIController::NavigateToExternalPasswordManager() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   NOTREACHED();
 #else
   chrome::NavigateParams params(
@@ -311,7 +311,7 @@ void ManagePasswordsUIController::NavigateToExternalPasswordManager() {
 }
 
 void ManagePasswordsUIController::NavigateToSmartLockPage() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   NOTREACHED();
 #else
   chrome::NavigateParams params(
@@ -324,7 +324,7 @@ void ManagePasswordsUIController::NavigateToSmartLockPage() {
 }
 
 void ManagePasswordsUIController::NavigateToSmartLockHelpPage() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   NOTREACHED();
 #else
   chrome::NavigateParams params(
@@ -336,7 +336,7 @@ void ManagePasswordsUIController::NavigateToSmartLockHelpPage() {
 }
 
 void ManagePasswordsUIController::NavigateToPasswordManagerSettingsPage() {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   chrome::android::ChromeApplication::ShowPasswordSettings();
 #else
   chrome::ShowSettingsSubPage(
@@ -393,12 +393,12 @@ void ManagePasswordsUIController::DidNavigateMainFrame(
 }
 
 void ManagePasswordsUIController::WasHidden() {
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
   TabDialogs::FromWebContents(web_contents())->HideManagePasswordsBubble();
 #endif
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
 void ManagePasswordsUIController::UpdateIconAndBubbleState(
     ManagePasswordsIconView* icon) {
   if (should_pop_up_bubble_) {
@@ -414,7 +414,7 @@ void ManagePasswordsUIController::UpdateIconAndBubbleState(
 
 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;