chrome/browser/ui/intents/web_intent_picker_controller.cc - Issue 10831308: Revert 151036 - Speculative revert to see if this change introduced a performance regression on Mac…

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.cc

Issue 10831308: Revert 151036 - Speculative revert to see if this change introduced a performance regression on Mac… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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/cocoa/location_bar/location_icon_decoration.mm ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/browser/ui/intents/web_intent_picker_controller.cc (revision 151481)

+++ chrome/browser/ui/intents/web_intent_picker_controller.cc (working copy)

@@ -305,9 +305,8 @@

break;

case WebIntentPickerModel::DISPOSITION_WINDOW: {

- int index = TabStripModel::kNoTab;

- Browser* browser = browser::FindBrowserForController(

- &tab_contents_->web_contents()->GetController(), &index);

+ Browser* browser = browser::FindBrowserWithWebContents(

+ tab_contents_->web_contents());

TabContents* contents = chrome::TabContentsFactory(

tab_contents_->profile(),

tab_util::GetSiteInstanceForNewTab(

@@ -468,10 +467,10 @@

if (service_tab_ &&

reply_type != webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED) {

- int index = TabStripModel::kNoTab;

- Browser* browser = browser::FindBrowserForController(

- &service_tab_->GetController(), &index);

+ Browser* browser = browser::FindBrowserWithWebContents(service_tab_);

if (browser) {

+ int index = browser->tab_strip_model()->GetIndexOfWebContents(

+ service_tab_);

browser->tab_strip_model()->CloseTabContentsAt(

index, TabStripModel::CLOSE_CREATE_HISTORICAL_TAB);