chrome/browser/ui/tab_helpers.cc - Issue 2578363002: Wire up download attribution enable finch experiment

Unified Diff: chrome/browser/ui/tab_helpers.cc

Issue 2578363002: Wire up download attribution enable finch experiment (Closed)

Patch Set: Re-enable SingleMetaRefreshRedirectTargetBlank on linux Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/tab_helpers.cc

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

index 74e762cf20c2e4276b868ce290ef36326b2ee490..6bb2b451c0c14fdd400135ebb688858be108146d 100644

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -32,6 +32,7 @@

#include "chrome/browser/prerender/prerender_tab_helper.h"

#include "chrome/browser/previews/previews_infobar_tab_helper.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/safe_browsing/safe_browsing_service.h"

#include "chrome/browser/sessions/session_tab_helper.h"

#include "chrome/browser/ssl/security_state_tab_helper.h"

#include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"

@@ -77,6 +78,8 @@

#else

#include "chrome/browser/banners/app_banner_manager_desktop.h"

#include "chrome/browser/plugins/plugin_observer.h"

+#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer.h"

+#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h"

#include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"

#include "chrome/browser/thumbnails/thumbnail_tab_helper.h"

#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"

@@ -228,6 +231,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {

PluginObserver::CreateForWebContents(web_contents);

SadTabHelper::CreateForWebContents(web_contents);

safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents);

+ if (safe_browsing::SafeBrowsingNavigationObserverManager::IsEnabledAndReady(

Nathan Parker 2016/12/20 01:01:33 Would it be tidier to keep all this logic in the n

Jialiu Lin 2016/12/20 02:07:51 You're right. Move all the checkings to SafeBrowsi

+ Profile::FromBrowserContext(web_contents->GetBrowserContext()))) {

+ safe_browsing::SafeBrowsingNavigationObserver::CreateForWebContents(

+ web_contents,

+ g_browser_process->safe_browsing_service()

+ ->navigation_observer_manager());

+ }

TabContentsSyncedTabDelegate::CreateForWebContents(web_contents);

TabDialogs::CreateForWebContents(web_contents);

ThumbnailTabHelper::CreateForWebContents(web_contents);