Use a uniform opaque type to represent web contents modal dialogs

chrome/browser/ui/views/constrained_window_views.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 594 matching lines @@
 #if defined(USE_ASH)
   // We don't necessarily have a RootWindow yet.
   if (GetNativeView()->GetRootWindow())
     GetNativeView()->Focus();
 #endif
 }
 
 void ConstrainedWindowViews::PulseWebContentsModalDialog() {
 }
 
-gfx::NativeWindow ConstrainedWindowViews::GetNativeWindow() {
-  return Widget::GetNativeWindow();
+NativeWebContentsModalDialog ConstrainedWindowViews::GetNativeDialog() {
+  return GetNativeView();
 }
 
 ConstrainedWindowViews* ConstrainedWindowViews::Create(
     content::WebContents* web_contents,
     views::WidgetDelegate* widget_delegate) {
   WebContentsModalDialogManager* manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   ConstrainedWindowViews* dialog = new ConstrainedWindowViews(
       web_contents->GetNativeView(),
       web_contents->GetBrowserContext()->IsOffTheRecord(),
       widget_delegate);
   manager->AddDialog(dialog);
   return dialog;
 }
 
 views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {
   if (views::DialogDelegate::UseNewStyle())
     return views::DialogDelegate::CreateNewStyleFrameView(this);
 #if defined(USE_ASH)
   ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
   frame->Init(this);
   return frame;
 #endif
   return new ConstrainedWindowFrameView(this, off_the_record_);
 }