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

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_custom_window.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.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.h

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

index 9c4f77be797e355562ad9d865c054d814d301e7b..d7775426df6930c1bd29cc2b16ca2ba044b5330c 100644

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

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

@@ -8,7 +8,7 @@

#import <Cocoa/Cocoa.h>

#include "base/memory/scoped_nsobject.h"

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

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

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

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

@@ -28,7 +28,7 @@ class ConstrainedWindowMacDelegate {

// Constrained window implementation for Mac.

// Normally an instance of this class is owned by the delegate. The delegate

// should delete the instance when the window is closed.

-class ConstrainedWindowMac : public ConstrainedWindow,

+class ConstrainedWindowMac : public WebContentsModalDialog,

public content::NotificationObserver {

public:

ConstrainedWindowMac(

@@ -37,10 +37,11 @@ class ConstrainedWindowMac : public ConstrainedWindow,

id<ConstrainedWindowSheet> sheet);

virtual ~ConstrainedWindowMac();

- // ConstrainedWindow implementation.

+ // WebContentsModalDialog implementation.

virtual void ShowWebContentsModalDialog() OVERRIDE;

// Closes the constrained window and deletes this instance.

virtual void CloseWebContentsModalDialog() OVERRIDE;

+ virtual void FocusWebContentsModalDialog() OVERRIDE;

virtual void PulseWebContentsModalDialog() OVERRIDE;

virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;

virtual bool CanShowWebContentsModalDialog() OVERRIDE;

@@ -56,7 +57,7 @@ class ConstrainedWindowMac : public ConstrainedWindow,

ConstrainedWindowMacDelegate* delegate_; // weak, owns us.

- // The WebContents that owns and constrains this ConstrainedWindow. Weak.

+ // The WebContents that owns and constrains this WebContentsModalDialog. Weak.

content::WebContents* web_contents_;

scoped_nsprotocol<id<ConstrainedWindowSheet> > sheet_;