Use gfx::NativeView rather than gfx::NativeWindow to identify web contents modal dialogs

chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

 // 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/cocoa/constrained_window/constrained_window_mac.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
 ConstrainedWindowMac::ConstrainedWindowMac(
     ConstrainedWindowMacDelegate* delegate,
     content::WebContents* web_contents,
     id<ConstrainedWindowSheet> sheet)
     : delegate_(delegate),
       web_contents_(web_contents),
       sheet_([sheet retain]),
+      dummyView_([NSView alloc]),
       pending_show_(false) {
   DCHECK(web_contents);
   DCHECK(sheet_.get());
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   web_contents_modal_dialog_manager->AddDialog(this);
 
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                  content::Source<content::WebContents>(web_contents));
@@ skipping 32 matching lines @@
 }
 
 void ConstrainedWindowMac::FocusWebContentsModalDialog() {
 }
 
 void ConstrainedWindowMac::PulseWebContentsModalDialog() {
   [[ConstrainedWindowSheetController controllerForSheet:sheet_]
       pulseSheet:sheet_];
 }
 
-gfx::NativeWindow ConstrainedWindowMac::GetNativeWindow() {
-  NOTREACHED();
-  return nil;
+gfx::NativeView ConstrainedWindowMac::GetNativeView() {
+  // TODO(wittman): Return a NSView that is meaningful and unique to the window,
+  // and remove dummyView_.
+  return dummyView_.get();
 }
 
 void ConstrainedWindowMac::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type != content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED) {
     NOTREACHED();
     return;
   }
 
   if (pending_show_) {
     pending_show_ = false;
     ShowWebContentsModalDialog();
   }
 }
 
 NSWindow* ConstrainedWindowMac::GetParentWindow() const {
   // Tab contents in a tabbed browser may not be inside a window. For this
   // reason use a browser window if possible.
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (browser)
     return browser->window()->GetNativeWindow();
 
   return web_contents_->GetView()->GetTopLevelNativeWindow();
 }