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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ssl/bad_clock_blocking_page.cc

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« chrome/browser/speech/tts_android.cc ('K') | « chrome/browser/speech/tts_android.cc ('k') | chrome/browser/supervised_user/supervised_user_interstitial.cc » ('j') | chrome/browser/ui/webui/version_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/bad_clock_blocking_page.cc
diff --git a/chrome/browser/ssl/bad_clock_blocking_page.cc b/chrome/browser/ssl/bad_clock_blocking_page.cc
index 6ad49b92c2d168e8c8160b553314537ca1587dbd..e5bc43254929071ac9942dbaff2ac25d5f9e6db1 100644
--- a/chrome/browser/ssl/bad_clock_blocking_page.cc
+++ b/chrome/browser/ssl/bad_clock_blocking_page.cc
@@ -49,7 +49,7 @@
#include "net/cert/x509_certificate.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
#include "chrome/browser/android/intent_helper.h"
#endif
@@ -81,9 +81,8 @@ void LaunchDateAndTimeSettings() {
DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
// The code for each OS is completely separate, in order to avoid bugs like
// https://crbug.com/430877 .
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
chrome::android::OpenDateAndTimeSettings();
-
#elif defined(OS_CHROMEOS)
std::string sub_page =
std::string(chrome::kSearchSubPage) + "#" +
« chrome/browser/speech/tts_android.cc ('K') | « chrome/browser/speech/tts_android.cc ('k') | chrome/browser/supervised_user/supervised_user_interstitial.cc » ('j') | chrome/browser/ui/webui/version_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698