Chromium Code Reviews| Index: chrome/browser/services/gcm/push_messaging_service_impl.cc |
| diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc |
| index 6a59cbe68209fa39f21ee10ad0f35eb8636bcfbd..0fc31b4ed8eaf60a4de8fb0165d278b419bfabe3 100644 |
| --- a/chrome/browser/services/gcm/push_messaging_service_impl.cc |
| +++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc |
| @@ -33,9 +33,19 @@ |
| #include "content/public/common/child_process_host.h" |
| #include "content/public/common/content_switches.h" |
| #include "content/public/common/platform_notification_data.h" |
| +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| #include "third_party/skia/include/core/SkBitmap.h" |
| #include "ui/base/l10n/l10n_util.h" |
| +#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 |
| +#include "chrome/browser/ui/browser.h" |
| +#include "chrome/browser/ui/browser_iterator.h" |
| +#include "chrome/browser/ui/tabs/tab_strip_model.h" |
| +#endif |
| + |
| namespace gcm { |
| namespace { |
| @@ -243,6 +253,53 @@ void PushMessagingServiceImpl::RequireUserVisibleUX( |
| if (notification_count > 0) |
| return; |
| + // Sites with a currently visible tab don't need to show notifications. |
| +#if defined(OS_ANDROID) |
| + for (TabModel* tab_model : TabModelList) { |
| + Profile* profile = tab_model->GetProfile(); |
| + content::WebContents* active_web_contents = |
| + tab_model->GetActiveWebContents(); |
| +#else |
| + for (chrome::BrowserIterator it; !it.done(); it.Next()) { |
| + Profile* profile = it->profile(); |
| + content::WebContents* active_web_contents = |
| + it->tab_strip_model()->GetActiveWebContents(); |
| +#endif |
| + |
| + // Don't leak information from other profiles. |
| + if (!profile || profile->IsOffTheRecord() || |
| + !profile->IsSameProfile(profile_)) { |
|
mlamouri (slow - plz ping)
2015/02/02 12:36:57
These checks do not really match the comment. Only
johnme
2015/02/02 15:58:36
Done (I changed it to profile_!=profile, since IsS
|
| + continue; |
| + } |
| + |
| + // Ignore minimized windows etc. |
| + if (!active_web_contents) |
|
mlamouri (slow - plz ping)
2015/02/02 12:36:58
Again, the check doesn't match the comment. Could
johnme
2015/02/02 15:58:36
Done (split this out).
|
| + continue; |
| + switch (active_web_contents->GetMainFrame()->GetVisibilityState()) { |
| + case blink::WebPageVisibilityStateHidden: |
| + case blink::WebPageVisibilityStatePrerender: |
| + continue; |
| + case blink::WebPageVisibilityStateVisible: |
| + break; |
| + } |
| + |
| + // Use the visible URL since that's the one the user is aware of (and it |
| + // doesn't matter whether the page loaded successfully). |
| + const GURL& active_url = active_web_contents->GetVisibleURL(); |
| + |
| + // Allow https://foo.example.com Service Worker to not show notification if |
| + // an https://bar.example.com tab is visible (and hence might conceivably |
| + // be showing UI in response to the push message); but http:// doesn't count |
| + // as even with navigator.connect the Service Worker can't talk to it. |
|
mlamouri (slow - plz ping)
2015/02/02 12:36:57
I wouldn't mention navigator.connect in the commen
johnme
2015/02/02 15:58:36
Chrome already implements most of navigator.connec
mlamouri (slow - plz ping)
2015/02/02 16:23:35
Chrome implementing it doesn't mean it will ship a
|
| + if (application_id.origin.scheme() != active_url.scheme()) |
| + continue; |
| + if (net::registry_controlled_domains::SameDomainOrHost( |
| + application_id.origin, active_url, |
| + net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES)) { |
| + return; |
| + } |
| + } |
| + |
| // If we haven't returned yet, the site failed to show a notification, so we |
| // will show a generic notification. See https://crbug.com/437277 |
| // TODO(johnme): The generic notification should probably automatically close |