chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc - Issue 9649020: [Web Intents] WebIntentPickerModel uses URL instead of index to reference registered services.

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 9649020: [Web Intents] WebIntentPickerModel uses URL instead of index to reference registered services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mac fix Created 8 years, 9 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

« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller.cc ('k') | chrome/browser/ui/intents/web_intent_picker_delegate.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 2e080f52144f98186833682b5623a8a5a2d2a94b..9dab1d2993f0a1fdc1d0a635a922a45bf55dca59 100644

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

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

@@ -126,7 +126,8 @@ class WebIntentPickerMock : public WebIntentPicker,

num_extension_icons_changed_++;

}

- virtual void OnInlineDisposition(WebIntentPickerModel* model) OVERRIDE {}

+ virtual void OnInlineDisposition(

+ WebIntentPickerModel* model, const GURL& url) OVERRIDE {}

virtual void Close() OVERRIDE {}

virtual void OnPendingAsyncCompleted() OVERRIDE {

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

controller_->OnSendReturnMessage(reply_type);

}

- void OnServiceChosen(size_t index, Disposition disposition) {

- controller_->OnServiceChosen(index, disposition);

+ void OnServiceChosen(const GURL& url, Disposition disposition) {

+ controller_->OnServiceChosen(url, disposition);

}

void OnCancelled() {

@@ -283,7 +284,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) {

IntentsDispatcherMock dispatcher(intent);

controller_->SetIntentsDispatcher(&dispatcher);

- OnServiceChosen(1, WebIntentPickerModel::DISPOSITION_WINDOW);

+ OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW);

ASSERT_EQ(2, browser()->tab_count());

EXPECT_EQ(GURL(kServiceURL2),

browser()->GetSelectedWebContents()->GetURL());

@@ -344,7 +345,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest,

IntentsDispatcherMock dispatcher(intent);

controller_->SetIntentsDispatcher(&dispatcher);

- OnServiceChosen(0, WebIntentPickerModel::DISPOSITION_WINDOW);

+ OnServiceChosen(kServiceURL1, WebIntentPickerModel::DISPOSITION_WINDOW);

ASSERT_EQ(3, browser()->tab_count());

EXPECT_EQ(GURL(kServiceURL1),

browser()->GetSelectedWebContents()->GetURL());