| Index: chrome/browser/push_messaging/push_messaging_notification_manager.cc
|
| diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.cc b/chrome/browser/push_messaging/push_messaging_notification_manager.cc
|
| index e6fb974a2d2e6d060fc376c5aa6a5659d348fcbc..c1c627b7f1ba39de88d41444196e59702ee98447 100644
|
| --- a/chrome/browser/push_messaging/push_messaging_notification_manager.cc
|
| +++ b/chrome/browser/push_messaging/push_messaging_notification_manager.cc
|
| @@ -17,7 +17,6 @@
|
| #include "chrome/browser/notifications/platform_notification_service_impl.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/push_messaging/push_messaging_constants.h"
|
| -#include "chrome/common/features.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/rappor/public/rappor_utils.h"
|
| #include "components/rappor/rappor_service_impl.h"
|
| @@ -36,7 +35,7 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "url/gurl.h"
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| #include "chrome/browser/ui/android/tab_model/tab_model.h"
|
| #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
|
| #else
|
| @@ -148,7 +147,7 @@ void PushMessagingNotificationManager::DidGetNotificationsFromDatabase(
|
| bool notification_needed = true;
|
|
|
| // Sites with a currently visible tab don't need to show notifications.
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| for (auto it = TabModelList::begin(); it != TabModelList::end(); ++it) {
|
| Profile* profile = (*it)->GetProfile();
|
| WebContents* active_web_contents = (*it)->GetActiveWebContents();
|
|
|