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

Unified Diff: chrome/browser/engagement/site_engagement_helper.cc

Issue 1338603002: Implement a site engagement score based on time-on-site. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More web contents validity checking Created 5 years, 3 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/engagement/site_engagement_helper.cc
diff --git a/chrome/browser/engagement/site_engagement_helper.cc b/chrome/browser/engagement/site_engagement_helper.cc
index b107edf030c458bb1d9803395d91ab0dbc7652c6..aa523d456c2ee2b27ad933493784c66be1aabd84 100644
--- a/chrome/browser/engagement/site_engagement_helper.cc
+++ b/chrome/browser/engagement/site_engagement_helper.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/engagement/site_engagement_helper.h"
+#include "base/time/time.h"
#include "chrome/browser/engagement/site_engagement_service.h"
#include "chrome/browser/engagement/site_engagement_service_factory.h"
#include "chrome/browser/prerender/prerender_contents.h"
@@ -11,36 +12,132 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
+namespace {
+
+const int kSecondsBetweenUserInputCheck = 10;
+
+} // anonymous namespace
+
DEFINE_WEB_CONTENTS_USER_DATA_KEY(SiteEngagementHelper);
SiteEngagementHelper::~SiteEngagementHelper() {
+ timer_.Stop();
+ content::WebContents* contents = web_contents();
+ if (contents)
+ RemoveInputCallbacks(contents->GetRenderViewHost());
}
SiteEngagementHelper::SiteEngagementHelper(content::WebContents* web_contents)
- : content::WebContentsObserver(web_contents) {
+ : content::WebContentsObserver(web_contents),
+ user_input_recorded_(false),
+ callbacks_added_(false),
+ ignore_page_(false) {
+ key_press_event_callback_ = base::Bind(
+ &SiteEngagementHelper::HandleKeyPressEvent, base::Unretained(this));
+ mouse_event_callback_ = base::Bind(&SiteEngagementHelper::HandleMouseEvent,
+ base::Unretained(this));
+ RegisterInputCallbacks(web_contents->GetRenderViewHost());
benwells 2015/09/16 00:23:32 Should the callbacks be registered here? Won't the
dominickn 2015/09/18 06:05:27 There isn't a strong relationship between timer ru
+}
+
+// Record that there was some user input, and defer handling of the input event.
+// web_contents() will return nullptr if the observed contents have been
+// deleted.
+bool SiteEngagementHelper::HandleKeyPressEvent(
+ const content::NativeWebKeyboardEvent& event) {
+ user_input_recorded_ = true;
+ content::WebContents* contents = web_contents();
+ if (contents)
+ RemoveInputCallbacks(contents->GetRenderViewHost());
+ return false;
+}
+
+bool SiteEngagementHelper::HandleMouseEvent(const blink::WebMouseEvent& event) {
+ user_input_recorded_ = true;
+ content::WebContents* contents = web_contents();
+ if (contents)
+ RemoveInputCallbacks(contents->GetRenderViewHost());
+ return false;
+}
+
+void SiteEngagementHelper::RegisterInputCallbacks(
+ content::RenderViewHost* host) {
+ if (!callbacks_added_) {
benwells 2015/09/16 00:23:32 I wonder if this could be encapsulated into some s
dominickn 2015/09/18 06:05:27 I'm concerned whether the additional clarity comes
+ host->AddKeyPressEventCallback(key_press_event_callback_);
+ host->AddMouseEventCallback(mouse_event_callback_);
+ callbacks_added_ = true;
+ }
+}
+
+void SiteEngagementHelper::RemoveInputCallbacks(
+ content::RenderViewHost* host) {
+ if (callbacks_added_) {
+ host->RemoveKeyPressEventCallback(key_press_event_callback_);
+ host->RemoveMouseEventCallback(mouse_event_callback_);
+ callbacks_added_ = false;
+ }
+}
+
+void SiteEngagementHelper::StartTimer() {
+ timer_.Start(FROM_HERE,
+ base::TimeDelta::FromSeconds(kSecondsBetweenUserInputCheck),
+ this, &SiteEngagementHelper::TimerFired);
}
void SiteEngagementHelper::DidStartNavigationToPendingEntry(
const GURL& url,
content::NavigationController::ReloadType reload_type) {
+ content::WebContents* contents = web_contents();
prerender::PrerenderContents* prerender_contents =
- prerender::PrerenderContents::FromWebContents(web_contents());
+ prerender::PrerenderContents::FromWebContents(contents);
- // Ignore pre-render loads.
- if (prerender_contents != NULL)
- return;
+ // Ignore pre-render loads and all schemes except HTTP and HTTPS.
+ ignore_page_ = (prerender_contents != NULL || !url.SchemeIsHTTPOrHTTPS());
+}
- // Ignore all schemes except HTTP and HTTPS.
- if (!url.SchemeIsHTTPOrHTTPS())
+void SiteEngagementHelper::TimerFired() {
+ if (ignore_page_)
benwells 2015/09/16 00:23:32 I don't really like having this timer running all
dominickn 2015/09/18 06:05:27 I have changed this design such that the timer is
return;
+ content::WebContents* contents = web_contents();
+ if (contents) {
+ GURL url = contents->GetVisibleURL();
+ if (user_input_recorded_) {
+ Profile* profile =
+ Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+ SiteEngagementService* service =
+ SiteEngagementServiceFactory::GetForProfile(profile);
- Profile* profile =
- Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- SiteEngagementService* service =
- SiteEngagementServiceFactory::GetForProfile(profile);
- // Service is null in incognito.
- if (!service)
- return;
+ // Service is null in incognito.
+ if (service)
+ service->HandleUserInput(url);
+ RegisterInputCallbacks(contents->GetRenderViewHost());
+ }
+ }
+ user_input_recorded_ = false;
+}
+
+void SiteEngagementHelper::RenderViewHostChanged(
+ content::RenderViewHost* old_host,
+ content::RenderViewHost* new_host) {
+ // On changing the render view host, we need to re-register the callbacks
+ // listening for user input.
+ if (old_host)
+ RemoveInputCallbacks(old_host);
+ RegisterInputCallbacks(new_host);
+}
+
+void SiteEngagementHelper::WasShown() {
+ // When we come back into view, ensure that the input listening callbacks are
+ // registered.
+ user_input_recorded_ = false;
+ RegisterInputCallbacks(web_contents()->GetRenderViewHost());
+ StartTimer();
+}
- service->HandleNavigation(url);
benwells 2015/09/16 00:23:32 Why is this now removed? I am guessing you're equa
dominickn 2015/09/18 06:05:27 calamity@ wanted to remove navigation tracking ent
+void SiteEngagementHelper::WasHidden() {
+ // Ensure that we are not recording user events for hidden web contents.
+ timer_.Stop();
+ user_input_recorded_ = false;
+ content::WebContents* contents = web_contents();
+ if (contents)
+ RemoveInputCallbacks(contents->GetRenderViewHost());
}

Powered by Google App Engine
This is Rietveld 408576698