chrome/browser/ui/intents/web_intent_picker_controller.cc - Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2)

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 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 12 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/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc ('k') | chrome/browser/ui/login/login_prompt.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.cc

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

index c341c1b3ccfa2ba6ec2282683c6c1fb57ef93ca0..8a7a5ef06e6a535b6738f858abbafa2552eac807 100644

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

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

@@ -31,11 +31,11 @@

#include "chrome/browser/ui/browser_navigator.h"

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

-#include "chrome/browser/ui/constrained_window_tab_helper.h"

#include "chrome/browser/ui/intents/web_intent_icon_loader.h"

#include "chrome/browser/ui/intents/web_intent_picker.h"

#include "chrome/browser/ui/intents/web_intent_picker_model.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"

#include "chrome/browser/webdata/web_data_service.h"

#include "chrome/common/url_constants.h"

#include "content/public/browser/browser_thread.h"

@@ -239,9 +239,9 @@ void WebIntentPickerController::ShowDialog(DefaultsUsage suppress_defaults) {

// As soon as the dialog is requested, block all input events

// on the original tab.

- ConstrainedWindowTabHelper* constrained_window_tab_helper =

- ConstrainedWindowTabHelper::FromWebContents(web_contents_);

- constrained_window_tab_helper->BlockWebContentsInteraction(true);

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents_);

+ web_contents_modal_dialog_manager->BlockWebContentsInteraction(true);

SetDialogState(kPickerSetup);

pending_async_count_++;

@@ -703,9 +703,9 @@ void WebIntentPickerController::Reset() {

picker_shown_ = false;

DCHECK(web_contents_);

- ConstrainedWindowTabHelper* constrained_window_tab_helper =

- ConstrainedWindowTabHelper::FromWebContents(web_contents_);

- constrained_window_tab_helper->BlockWebContentsInteraction(false);

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents_);

+ web_contents_modal_dialog_manager->BlockWebContentsInteraction(false);

}

void WebIntentPickerController::OnShowExtensionInstallDialog(