chrome/browser/ui/gtk/web_intent_picker_gtk.cc - Issue 8508019: Add a method to the controller to close the picker/service tab when a return value is passed.

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/gtk/web_intent_picker_gtk.cc

Issue 8508019: Add a method to the controller to close the picker/service tab when a return value is passed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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/gtk/web_intent_picker_gtk.h ('k') | chrome/browser/ui/intents/web_intent_picker_controller.h » ('j') | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/web_intent_picker_gtk.cc

diff --git a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc

index d46250190c327f15a518f90536ca2e6518df3b73..d413ea0ad390316a06ec1933ed1f7e1d5f657c92 100644

--- a/chrome/browser/ui/gtk/web_intent_picker_gtk.cc

+++ b/chrome/browser/ui/gtk/web_intent_picker_gtk.cc

@@ -165,10 +165,8 @@ void WebIntentPickerGtk::SetDefaultServiceIcon(size_t index) {

void WebIntentPickerGtk::Close() {

bubble_->Close();

bubble_ = NULL;

- inline_disposition_tab_contents_.reset();

- inline_disposition_delegate_.reset();

- tab_contents_container_.reset();

+ if (inline_disposition_tab_contents_.get() != NULL)

James Hawkins 2011/11/10 00:57:28 if (inline_...contents_.get()) suffices.

Greg Billock 2011/11/10 20:00:43 Done.

+ inline_disposition_tab_contents_->tab_contents()->OnCloseStarted();

}

void WebIntentPickerGtk::BubbleClosing(BubbleGtk* bubble,