| 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..a92226853ec499fa0bb13e333d232eb423043928 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/supervised_user/supervised_user_service.h"
|
| #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
|
| -#include "chrome/common/features.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/infobars/core/infobar.h"
|
| @@ -39,9 +38,9 @@
|
| #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)
|
| +#else
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| @@ -269,7 +268,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_),
|
|
|