MacViews: Unify web contents modal dialog types

components/web_modal/native_web_contents_modal_dialog.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_WEB_MODAL_NATIVE_WEB_CONTENTS_MODAL_DIALOG_H_
 #define COMPONENTS_WEB_MODAL_NATIVE_WEB_CONTENTS_MODAL_DIALOG_H_
 
 #include "ui/gfx/native_widget_types.h"
 
 namespace web_modal {
 
 // TODO(gbillock): rename this file

[Robert Sesek, 2015/03/02 22:15:27]

It seems like this entire file could be removed and the gfx types could be use
instead.

[Andre, 2015/03/02 22:45:38]

There are quite a bit of call sites that will need to be adjusted.
I can do this replacement in a separate CL if wittman@ and msw@ approves.

[Mike Wittman, 2015/03/02 22:48:31]

Replacing types and removing this file in a separate CL sgtm.

[msw, 2015/03/02 23:07:02]

Ditto, I think that's a great suggestion.

 
-#if defined(OS_MACOSX)
-// Use a void* since none of the gfx::Native* types are suitable for
-// representing the web contents modal dialog under Cocoa.
-typedef void* NativeWebContentsModalDialog;
-#else
-typedef gfx::NativeView NativeWebContentsModalDialog;
-#endif
-
-#if defined(OS_MACOSX)
-// Use a void* since none of the gfx::Native* types are suitable for
-// representing a popup window under Cocoa.
-typedef void* NativePopup;
-#else
-typedef gfx::NativeView NativePopup;
-#endif
+typedef gfx::NativeWindow NativeWebContentsModalDialog;

[Robert Sesek, 2015/03/02 22:15:27]

|using| is now preferred.

[Andre, 2015/03/02 22:45:38]

Done.

+typedef gfx::NativeWindow NativePopup;
 
 }  // namespace web_modal
 
 #endif  // COMPONENTS_WEB_MODAL_NATIVE_WEB_CONTENTS_MODAL_DIALOG_H_