Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: chrome/browser/signin/chrome_signin_helper.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/signin/chrome_signin_helper.cc
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc
index a0a4522f43509217aaaa110cac881d73497fb860..d2c03f21d87209d954daf8ae6b9f6d1e1376b20e 100644
--- a/chrome/browser/signin/chrome_signin_helper.cc
+++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -22,13 +22,13 @@
#include "google_apis/gaia/gaia_auth_util.h"
#include "net/url_request/url_request.h"
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
#include "chrome/browser/android/signin/account_management_screen_helper.h"
#else
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
-#endif // BUILDFLAG(ANDROID_JAVA_UI)
+#endif // defined(OS_ANDROID)
namespace signin {
@@ -56,7 +56,7 @@ void ProcessMirrorHeaderUIThread(int child_id,
AccountReconcilorFactory::GetForProfile(profile);
account_reconcilor->OnReceivedManageAccountsResponse(
manage_accounts_params.service_type);
-#if !BUILDFLAG(ANDROID_JAVA_UI)
+#if !defined(OS_ANDROID)
Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
if (browser) {
BrowserWindow::AvatarBubbleMode bubble_mode;
@@ -79,7 +79,7 @@ void ProcessMirrorHeaderUIThread(int child_id,
bubble_mode, manage_accounts_params,
signin_metrics::AccessPoint::ACCESS_POINT_CONTENT_AREA);
}
-#else // BUILDFLAG(ANDROID_JAVA_UI)
+#else // defined(OS_ANDROID)
if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) {
GURL url(manage_accounts_params.continue_url.empty()
? chrome::kChromeUINativeNewTabURL
@@ -93,7 +93,7 @@ void ProcessMirrorHeaderUIThread(int child_id,
AccountManagementScreenHelper::OpenAccountManagementScreen(profile,
service_type);
}
-#endif // !BUILDFLAG(ANDROID_JAVA_UI)
+#endif // !defined(OS_ANDROID)
}
// Returns the parameters contained in the X-Chrome-Manage-Accounts response

Powered by Google App Engine
This is Rietveld 408576698