chrome/browser/ui/views/web_intent_picker_views.cc - Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1)

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

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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/views/tab_contents/chrome_web_contents_view_delegate_views.cc ('k') | chrome/browser/ui/web_contents_modal_dialog.h » ('j') | chrome/browser/ui/web_contents_modal_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/web_intent_picker_views.cc

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

index 7ea0b35f82d7b9f8d41b13f44ed082c9c9efc90b..95e558dca3d6b8c3a48daf71929f4bedde2a9a52 100644

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

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

@@ -1048,7 +1048,7 @@ class WebIntentPickerViews : public views::ButtonListener,

scoped_ptr<WebContents> inline_web_contents_;

// Indicate if dialog should display its own close button.

- // TODO(groby): Only relevant until new ConstrainedWindow is implemented,

+ // TODO(groby): Only relevant until new WebContentsModalDialog is implemented,

// from then on always true.

bool use_close_button_;

@@ -1143,7 +1143,7 @@ void WebIntentPickerViews::LinkClicked(views::Link* source, int event_flags) {

}

void WebIntentPickerViews::Close() {

- window_->CloseConstrainedWindow();

+ window_->CloseWebContentsModalDialog();

}

void WebIntentPickerViews::SetActionString(const string16& action) {