| Index: chrome/browser/notifications/notification_permission_context.cc
|
| diff --git a/chrome/browser/notifications/notification_permission_context.cc b/chrome/browser/notifications/notification_permission_context.cc
|
| index 096b6ed2ad649c3f96c24415d34f80c54276c219..9e21d0c1e5e93554238051619c2236ea97f63358 100644
|
| --- a/chrome/browser/notifications/notification_permission_context.cc
|
| +++ b/chrome/browser/notifications/notification_permission_context.cc
|
| @@ -4,15 +4,131 @@
|
|
|
| #include "chrome/browser/notifications/notification_permission_context.h"
|
|
|
| +#include <queue>
|
| +
|
| +#include "base/callback.h"
|
| +#include "base/location.h"
|
| +#include "base/rand_util.h"
|
| +#include "base/single_thread_task_runner.h"
|
| +#include "base/thread_task_runner_handle.h"
|
| +#include "base/timer/timer.h"
|
| #include "chrome/browser/notifications/desktop_notification_profile_util.h"
|
| +#include "chrome/browser/permissions/permission_request_id.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/permission_type.h"
|
| +#include "content/public/browser/render_frame_host.h"
|
| +#include "content/public/browser/web_contents_observer.h"
|
| +#include "content/public/browser/web_contents_user_data.h"
|
| #include "url/gurl.h"
|
|
|
| +namespace {
|
| +
|
| +// At most one of these is attached to each WebContents. It allows posting
|
| +// delayed tasks whose timer only counts down whilst the WebContents is visible
|
| +// (and whose timer is reset whenever the WebContents stops being visible).
|
| +class VisibilityTimerTabHelper
|
| + : public content::WebContentsObserver,
|
| + public content::WebContentsUserData<VisibilityTimerTabHelper> {
|
| + public:
|
| + ~VisibilityTimerTabHelper() override {}
|
| +
|
| + // Runs |task| after the WebContents has been visible for a consecutive
|
| + // duration of at least |visible_delay|.
|
| + void PostTaskAfterVisibleDelay(const tracked_objects::Location& from_here,
|
| + const base::Closure& task,
|
| + base::TimeDelta visible_delay);
|
| +
|
| + // WebContentsObserver:
|
| + void WasShown() override;
|
| + void WasHidden() override;
|
| + void WebContentsDestroyed() override;
|
| +
|
| + private:
|
| + friend class content::WebContentsUserData<VisibilityTimerTabHelper>;
|
| + explicit VisibilityTimerTabHelper(content::WebContents* contents);
|
| +
|
| + void RunTask(const base::Closure& task);
|
| +
|
| + bool is_visible_;
|
| + std::queue<scoped_ptr<base::Timer>> task_queue_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(VisibilityTimerTabHelper);
|
| +};
|
| +
|
| +VisibilityTimerTabHelper::VisibilityTimerTabHelper(
|
| + content::WebContents* contents)
|
| + : content::WebContentsObserver(contents) {
|
| + if (!contents->GetMainFrame()) {
|
| + is_visible_ = false;
|
| + } else {
|
| + switch (contents->GetMainFrame()->GetVisibilityState()) {
|
| + case blink::WebPageVisibilityStateHidden:
|
| + case blink::WebPageVisibilityStatePrerender:
|
| + is_visible_ = false;
|
| + break;
|
| + case blink::WebPageVisibilityStateVisible:
|
| + is_visible_ = true;
|
| + break;
|
| + }
|
| + }
|
| +}
|
| +
|
| +void VisibilityTimerTabHelper::PostTaskAfterVisibleDelay(
|
| + const tracked_objects::Location& from_here,
|
| + const base::Closure& task,
|
| + base::TimeDelta visible_delay) {
|
| + // Safe to use Unretained, as destroying this will destroy task_queue_, hence
|
| + // cancelling all timers.
|
| + task_queue_.push(make_scoped_ptr(new base::Timer(
|
| + from_here, visible_delay, base::Bind(&VisibilityTimerTabHelper::RunTask,
|
| + base::Unretained(this), task),
|
| + false /* is_repeating */)));
|
| + DCHECK(!task_queue_.back()->IsRunning());
|
| + if (is_visible_ && task_queue_.size() == 1)
|
| + task_queue_.front()->Reset();
|
| +}
|
| +
|
| +void VisibilityTimerTabHelper::WasShown() {
|
| + if (!is_visible_ && !task_queue_.empty())
|
| + task_queue_.front()->Reset();
|
| + is_visible_ = true;
|
| +}
|
| +
|
| +void VisibilityTimerTabHelper::WasHidden() {
|
| + if (is_visible_ && !task_queue_.empty())
|
| + task_queue_.front()->Stop();
|
| + is_visible_ = false;
|
| +}
|
| +
|
| +void VisibilityTimerTabHelper::WebContentsDestroyed() {
|
| + // Delete ourselves, to avoid running tasks after WebContents is destroyed.
|
| + web_contents()->RemoveUserData(UserDataKey());
|
| + // |this| has been deleted now.
|
| +}
|
| +
|
| +void VisibilityTimerTabHelper::RunTask(const base::Closure& task) {
|
| + DCHECK(is_visible_);
|
| + task.Run();
|
| + task_queue_.pop();
|
| + if (!task_queue_.empty()) {
|
| + task_queue_.front()->Reset();
|
| + return;
|
| + }
|
| + web_contents()->RemoveUserData(UserDataKey());
|
| + // |this| has been deleted now.
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| +DEFINE_WEB_CONTENTS_USER_DATA_KEY(VisibilityTimerTabHelper);
|
| +
|
| NotificationPermissionContext::NotificationPermissionContext(Profile* profile)
|
| : PermissionContextBase(profile,
|
| content::PermissionType::NOTIFICATIONS,
|
| - CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {}
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
|
| + weak_factory_ui_thread_(this) {}
|
|
|
| NotificationPermissionContext::~NotificationPermissionContext() {}
|
|
|
| @@ -23,6 +139,42 @@ void NotificationPermissionContext::ResetPermission(
|
| profile(), ContentSettingsPattern::FromURLNoWildcard(requesting_origin));
|
| }
|
|
|
| +void NotificationPermissionContext::DecidePermission(
|
| + content::WebContents* web_contents,
|
| + const PermissionRequestID& id,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin,
|
| + bool user_gesture,
|
| + const BrowserPermissionCallback& callback) {
|
| + DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| +
|
| + // Notifications permission is always denied in incognito. To prevent sites
|
| + // from using that to detect whether incognito mode is active, we deny after a
|
| + // random time delay, to simulate a user clicking a bubble/infobar. See also
|
| + // ContentSettingsRegistry::Init, which marks notifications as
|
| + // INHERIT_IN_INCOGNITO_EXCEPT_ALLOW, and
|
| + // PermissionMenuModel::PermissionMenuModel which prevents users from manually
|
| + // allowing the permission.
|
| + if (profile()->IsOffTheRecord()) {
|
| + // Random number of seconds in the range [1.0, 2.0).
|
| + double delay_seconds = 1.0 + 1.0 * base::RandDouble();
|
| + VisibilityTimerTabHelper::CreateForWebContents(web_contents);
|
| + VisibilityTimerTabHelper::FromWebContents(web_contents)
|
| + ->PostTaskAfterVisibleDelay(
|
| + FROM_HERE,
|
| + base::Bind(&NotificationPermissionContext::NotifyPermissionSet,
|
| + weak_factory_ui_thread_.GetWeakPtr(), id,
|
| + requesting_origin, embedding_origin, callback,
|
| + true /* persist */, CONTENT_SETTING_BLOCK),
|
| + base::TimeDelta::FromSecondsD(delay_seconds));
|
| + return;
|
| + }
|
| +
|
| + PermissionContextBase::DecidePermission(web_contents, id, requesting_origin,
|
| + embedding_origin, user_gesture,
|
| + callback);
|
| +}
|
| +
|
| // Unlike other permission types, granting a notification for a given origin
|
| // will not take into account the |embedder_origin|, it will only be based
|
| // on the requesting iframe origin.
|
|
|