chrome/browser/ui/views/search_view_controller.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/views/search_view_controller.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/views/search_view_controller.cc

diff --git a/chrome/browser/ui/views/search_view_controller.cc b/chrome/browser/ui/views/search_view_controller.cc

index 3a3111e8261ac8cf25b47a048206114e22e4490c..5886c4a75c12f5292593cbfb6f4c2bf623ea9d90 100644

--- a/chrome/browser/ui/views/search_view_controller.cc

+++ b/chrome/browser/ui/views/search_view_controller.cc

@@ -601,7 +601,9 @@ void SearchViewController::MaybeHideOverlay() {

}

chrome::search::SearchModel* SearchViewController::search_model() {

- return tab_contents_ ? tab_contents_->search_tab_helper()->model() : NULL;

+ return tab_contents_ ? chrome::search::SearchTabHelper::FromWebContents(

+ tab_contents_->web_contents())->model()

+ : NULL;

}

content::WebContents* SearchViewController::web_contents() {