From db0cc04178dd44b9dcd03a89db854d45a36fc37b Mon Sep 17 00:00:00 2001 From: "jschuh@chromium.org" Date: Sat, 16 Feb 2013 15:36:10 +0000 Subject: Revert 182969 Speculation was wrong. Reverting the revert. > Revert 182878 > > Speculative revert because this appears to be causing > ExtensionApiTest.UpdateWindowShowState to fail on Win7. > I'll reland if this is not the culprit. > > > Use a uniform opaque type to represent web contents modal dialogs > > > > Since the WebContentsModalDialog interface is going away, the > > platform-independent code in WebContentsModalDialogManager requires an > > opaque type with which to identify dialogs. > > > > In a first attempt at this under https://codereview.chromium.org/12224020, > > comments indicated that the Mac implementation of the web contents > > modal dialog does not fit any of the abstracted native types provided > > by ui/gfx/native_widget_types.h. So, define a special typedef > > NativeWebContentsModalDialog that uses the existing gfx::NativeView > > abstraction on platforms where supported, mainly to document the expected > > type. On Mac, we use a void* which is the preferred type for this, per > > Sailesh in comments in this review. > > > > BUG=157161 > > > > > > Review URL: https://chromiumcodereview.appspot.com/12221055 > > TBR=wittman@chromium.org > Review URL: https://codereview.chromium.org/12293002 TBR=jschuh@chromium.org Review URL: https://codereview.chromium.org/12288022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182974 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/gtk/constrained_window_gtk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/ui/gtk/constrained_window_gtk.h') diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h index a9807bd..9646665 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.h +++ b/chrome/browser/ui/gtk/constrained_window_gtk.h @@ -59,7 +59,7 @@ class ConstrainedWindowGtk : public WebContentsModalDialog { virtual void CloseWebContentsModalDialog() OVERRIDE; virtual void FocusWebContentsModalDialog() OVERRIDE; virtual void PulseWebContentsModalDialog() OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; + virtual NativeWebContentsModalDialog GetNativeDialog() OVERRIDE; // Called when the result of GetBackgroundColor may have changed. void BackgroundColorChanged(); -- cgit v1.1