chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm - 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/cocoa/constrained_window/constrained_window_mac.mm

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/cocoa/constrained_window/constrained_window_mac.h ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

index 61767151fca86ae0dee05c8b017c1796ba6448c0..e8f8d324f694276aa8a2a51d820744ae6e1502fd 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

@@ -10,7 +10,7 @@

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"

#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

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

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

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

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

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

@@ -27,9 +27,9 @@ ConstrainedWindowMac::ConstrainedWindowMac(

pending_show_(false) {

DCHECK(web_contents);

DCHECK(sheet_.get());

- ConstrainedWindowTabHelper* constrained_window_tab_helper =

- ConstrainedWindowTabHelper::FromWebContents(web_contents);

- constrained_window_tab_helper->AddDialog(this);

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents);

+ web_contents_modal_dialog_manager->AddDialog(this);

registrar_.Add(this,

content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,

@@ -61,13 +61,16 @@ void ConstrainedWindowMac::CloseWebContentsModalDialog() {

[[ConstrainedWindowSheetController controllerForSheet:sheet_]

closeSheet:sheet_];

- ConstrainedWindowTabHelper* constrained_window_tab_helper =

- ConstrainedWindowTabHelper::FromWebContents(web_contents_);

- constrained_window_tab_helper->WillClose(this);

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents_);

+ web_contents_modal_dialog_manager->WillClose(this);

if (delegate_)

delegate_->OnConstrainedWindowClosed(this);

}

+void ConstrainedWindowMac::FocusWebContentsModalDialog() {

void ConstrainedWindowMac::PulseWebContentsModalDialog() {

[[ConstrainedWindowSheetController controllerForSheet:sheet_]

pulseSheet:sheet_];