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

Unified Diff: chrome/browser/supervised_user/supervised_user_interstitial.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/supervised_user/supervised_user_interstitial.cc
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index d0a9f42806fcbe6aa514dbac284e4fc3d285d9c4..0742220daa99c9f40d5231808f4e673fbc9ad622 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -39,7 +39,7 @@
#include "ui/base/webui/jstemplate_builder.h"
#include "ui/base/webui/web_ui_util.h"
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
#include "chrome/browser/supervised_user/child_accounts/child_account_feedback_reporter_android.h"
#elif !defined(OS_ANDROID)
Ted C 2017/01/06 22:33:30 change to #else
F 2017/01/09 21:36:33 Done.
#include "chrome/browser/ui/browser_finder.h"
@@ -269,7 +269,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
reason_, true, second_custodian.empty()));
std::string message = l10n_util::GetStringFUTF8(
IDS_BLOCK_INTERSTITIAL_DEFAULT_FEEDBACK_TEXT, reason);
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
ReportChildAccountFeedback(web_contents_, message, url_);
#else
chrome::ShowFeedbackPage(chrome::FindBrowserWithWebContents(web_contents_),

Powered by Google App Engine
This is Rietveld 408576698