chrome/browser/ui/tab_contents/tab_contents.cc - Issue 10944016: Switch SearchTabHelper to use WebContentsUserData.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10944016: Switch SearchTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: const Created 8 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:

Index: chrome/browser/ui/tab_contents/tab_contents.cc

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

index a3cfa028d83eb70c351fd1c07e5c1f93e3f110c5..0ff696ed804283f255d83fcefd83680a4a9b60de 100644

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

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

@@ -44,7 +44,6 @@

#include "chrome/browser/ui/pdf/pdf_tab_helper.h"

#include "chrome/browser/ui/prefs/prefs_tab_helper.h"

#include "chrome/browser/ui/sad_tab_helper.h"

-#include "chrome/browser/ui/search/search.h"

#include "chrome/browser/ui/search/search_tab_helper.h"

#include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"

#include "chrome/browser/ui/snapshot_tab_helper.h"

@@ -145,10 +144,7 @@ TabContents::TabContents(WebContents* contents)

prefs_tab_helper_.reset(new PrefsTabHelper(contents));

prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));

search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));

- bool is_search_enabled =

- chrome::search::IsInstantExtendedAPIEnabled(profile());

- search_tab_helper_.reset(

- new chrome::search::SearchTabHelper(this, is_search_enabled));

+ chrome::search::SearchTabHelper::CreateForWebContents(contents);

SnapshotTabHelper::CreateForWebContents(contents);

SSLTabHelper::CreateForWebContents(contents);

synced_tab_delegate_.reset(new TabContentsSyncedTabDelegate(this));