chrome/browser/ui/views/constrained_window_views.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/views/constrained_window_views.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/views/constrained_web_dialog_delegate_views.cc ('k') | chrome/browser/ui/views/constrained_window_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/constrained_window_views.h

diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h

index 179c3cf4ae5f508d00d5aa87af45d30c9e2c261a..884f04b31bcd85f82e6a68c64cbde0e8021bd3e7 100644

--- a/chrome/browser/ui/views/constrained_window_views.h

+++ b/chrome/browser/ui/views/constrained_window_views.h

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_

#include "base/compiler_specific.h"

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

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

#include "ui/gfx/native_widget_types.h"

#include "ui/gfx/rect.h"

#include "ui/views/widget/widget.h"

@@ -51,12 +51,12 @@ class NativeConstrainedWindow {

///////////////////////////////////////////////////////////////////////////////

// ConstrainedWindowViews

-// A ConstrainedWindow implementation that implements a Constrained Window as

-// a child HWND with a custom window frame. The ConstrainedWindowViews owns

+// A WebContentsModalDialog implementation that implements the dialog as a

+// child HWND with a custom window frame. The ConstrainedWindowViews owns

// itself and will be deleted soon after being closed.

class ConstrainedWindowViews : public views::Widget,

- public ConstrainedWindow,

+ public WebContentsModalDialog,

public NativeConstrainedWindowDelegate {

public:

ConstrainedWindowViews(content::WebContents* web_contents,

@@ -66,10 +66,12 @@ class ConstrainedWindowViews : public views::Widget,

// Returns the WebContents that constrains this Constrained Window.

content::WebContents* owner() const { return web_contents_; }

- // Overridden from ConstrainedWindow:

+ // Overridden from WebContentsModalDialog:

virtual void ShowWebContentsModalDialog() OVERRIDE;

virtual void CloseWebContentsModalDialog() OVERRIDE;

virtual void FocusWebContentsModalDialog() OVERRIDE;

+ virtual void PulseWebContentsModalDialog() OVERRIDE;

+ virtual bool CanShowWebContentsModalDialog() OVERRIDE;

virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;

// Default insets for the dialog: