[stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 237 matching lines @@
   //
   // If you have any parenting or context information, or can pass that
   // information, prefer the WithParent or WithContext versions of these
   // methods.
   static Widget* CreateWindow(WidgetDelegate* delegate);
   static Widget* CreateWindowWithBounds(WidgetDelegate* delegate,
                                         const gfx::Rect& bounds);
 
   // Creates a decorated window Widget with the specified properties.
   static Widget* CreateWindowWithParent(WidgetDelegate* delegate,
-                                        gfx::NativeWindow parent);
+                                        gfx::NativeView parent);
   static Widget* CreateWindowWithParentAndBounds(WidgetDelegate* delegate,
-                                                 gfx::NativeWindow parent,
+                                                 gfx::NativeView parent,
                                                  const gfx::Rect& bounds);
 
   // Creates a decorated window Widget in the same desktop context as |context|.
   static Widget* CreateWindowWithContext(WidgetDelegate* delegate,
                                          gfx::NativeView context);
   static Widget* CreateWindowWithContextAndBounds(WidgetDelegate* delegate,
                                                   gfx::NativeView context,
                                                   const gfx::Rect& bounds);
 
   // Creates an undecorated child window Widget parented to |parent|.
@@ skipping 623 matching lines @@
   // True when window movement via mouse interaction with the frame should be
   // disabled.
   bool movement_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_