chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc - Issue 10959045: Switch WebIntentPickerController 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/intents/web_intent_picker_controller_browsertest.cc

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

Patch Set: rebase 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/intents/web_intent_picker_controller.h ('K') | « chrome/browser/ui/intents/web_intent_picker_controller.cc ('k') | chrome/browser/ui/tab_contents/tab_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

index 8a8aa4ef3b93865ec49f64b49cd4724a97710c1a..b7b388fb61d3e79b3829136708f904af4312cc68 100644

--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

@@ -241,8 +241,8 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {

GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);

favicon_service_ = FaviconServiceFactory::GetForProfile(

GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);

- controller_ = chrome::GetActiveTabContents(GetBrowser())->

- web_intent_picker_controller();

+ controller_ = WebIntentPickerController::FromWebContents(

+ chrome::GetActiveWebContents(GetBrowser()));

SetupMockPicker();

controller_->set_model_observer(&picker_);

@@ -369,7 +369,8 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) {

chrome::GetActiveWebContents(browser())->GetURL());

EXPECT_TRUE(GetWindowDispositionTarget(

- chrome::GetActiveTabContents(browser())->web_intent_picker_controller()));

+ WebIntentPickerController::FromWebContents(

+ chrome::GetActiveWebContents(browser()))));

EXPECT_TRUE(dispatcher.dispatched_);