Index: chrome/browser/ui/autofill/chrome_autofill_client.cc |
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc |
index 6f0db86ef991485b12f7f5100148d77fb77be3e3..b430a89d5b7944762a4b3d58b1cbde987f49de54 100644 |
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc |
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc |
@@ -49,7 +49,7 @@ |
#include "content/public/browser/ssl_status.h" |
#include "ui/gfx/geometry/rect.h" |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
#include "chrome/browser/android/chrome_application.h" |
#include "chrome/browser/ui/android/autofill/autofill_logger_android.h" |
#else |
@@ -90,7 +90,7 @@ ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents) |
->IsOffTheRecord()) { |
DCHECK(web_contents); |
-#if !BUILDFLAG(ANDROID_JAVA_UI) |
+#if !defined(OS_ANDROID) |
// Since ZoomController is also a WebContentsObserver, we need to be careful |
// about disconnecting from it since the relative order of destruction of |
// WebContentsObservers is not guaranteed. ZoomController silently clears |
@@ -143,7 +143,7 @@ IdentityProvider* ChromeAutofillClient::GetIdentityProvider() { |
Profile::FromBrowserContext(web_contents()->GetBrowserContext()) |
->GetOriginalProfile(); |
base::Closure login_callback; |
-#if !BUILDFLAG(ANDROID_JAVA_UI) |
+#if !defined(OS_ANDROID) |
login_callback = |
LoginUIServiceFactory::GetShowLoginPopupCallbackForProfile(profile); |
#endif |
@@ -161,13 +161,13 @@ rappor::RapporServiceImpl* ChromeAutofillClient::GetRapporServiceImpl() { |
} |
void ChromeAutofillClient::ShowAutofillSettings() { |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
chrome::android::ChromeApplication::ShowAutofillSettings(); |
#else |
Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); |
if (browser) |
chrome::ShowSettingsSubPage(browser, chrome::kAutofillSubPage); |
-#endif // #if BUILDFLAG(ANDROID_JAVA_UI) |
+#endif // #if defined(OS_ANDROID) |
} |
void ChromeAutofillClient::ShowUnmaskPrompt( |
@@ -298,7 +298,7 @@ bool ChromeAutofillClient::IsAutocompleteEnabled() { |
} |
void ChromeAutofillClient::MainFrameWasResized(bool width_changed) { |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
// Ignore virtual keyboard showing and hiding a strip of suggestions. |
if (!width_changed) |
return; |
@@ -332,10 +332,10 @@ void ChromeAutofillClient::PropagateAutofillPredictions( |
void ChromeAutofillClient::DidFillOrPreviewField( |
const base::string16& autofilled_value, |
const base::string16& profile_full_name) { |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
AutofillLoggerAndroid::DidFillOrPreviewField(autofilled_value, |
profile_full_name); |
-#endif // BUILDFLAG(ANDROID_JAVA_UI) |
+#endif // defined(OS_ANDROID) |
} |
void ChromeAutofillClient::OnFirstUserGestureObserved() { |