Make WebContentsView portable by using the native view types.

chrome/browser/tab_contents/web_contents_view.h

 // Copyright (c) 2006-2008 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 CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
 
-#include <windows.h>
-
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 
 class Browser;
 class RenderViewHost;
 class RenderWidgetHost;
 class RenderWidgetHostView;
 class RenderWidgetHostViewWin;  // TODO(brettw) this should not be necessary.
 class WebContents;
@@ skipping 19 matching lines @@
 
   virtual void CreateView() = 0;
 
   // Sets up the View that holds the rendered web page, receives messages for
   // it and contains page plugins.
   // TODO(brettw) make this so we don't need to return the Win version (see the
   // caller in WebContents).
   virtual RenderWidgetHostViewWin* CreateViewForWidget(
       RenderWidgetHost* render_widget_host) = 0;
 
-  // Returns the HWND that contains the contents of the tab.
-  // TODO(brettw) this should not be necessary in this cross-platform interface.
-  virtual HWND GetContainerHWND() const = 0;
+  // Returns the native widget that contains the contents of the tab.
+  virtual gfx::NativeView GetNativeView() const = 0;
 
-  // Returns the HWND with the main content of the tab (i.e. the main render
-  // view host, though there may be many popups in the tab as children of the
-  // container HWND).
-  // TODO(brettw) this should not be necessary in this cross-platform interface.
-  virtual HWND GetContentHWND() const = 0;
+  // Returns the native widget with the main content of the tab (i.e. the main
+  // render view host, though there may be many popups in the tab as children of
+  // the container).
+  virtual gfx::NativeView GetContentNativeView() const = 0;
 
   // Computes the rectangle for the native widget that contains the contents of
   // the tab relative to its parent.
   virtual void GetContainerBounds(gfx::Rect *out) const = 0;
 
   // Helper function for GetContainerBounds. Most callers just want to know the
   // size, and this makes it more clear.
   gfx::Size GetContainerSize() const {
     gfx::Rect rc;
     GetContainerBounds(&rc);
@@ skipping 77 matching lines @@
 
   // Internal interface for some functions in the RenderViewHostDelegate::View
   // interface. Subclasses should implement this rather than the corresponding
   // ...::View functions directly, since the routing stuff will already be
   // computed. They should implement the rest of the functions as normal.
   //
   // The only difference is that the Create functions return the newly
   // created objects so that they can be associated with the given routes. When
   // they are shown later, we'll look them up again and pass the objects to
   // the Show functions rather than the route ID.
-  virtual WebContents* CreateNewWindowInternal
-      (int route_id, base::WaitableEvent* modal_dialog_event) = 0;
+  virtual WebContents* CreateNewWindowInternal(
+      int route_id,
+      base::WaitableEvent* modal_dialog_event) = 0;
   virtual RenderWidgetHostView* CreateNewWidgetInternal(int route_id,
                                                         bool activatable) = 0;
   virtual void ShowCreatedWindowInternal(WebContents* new_web_contents,
                                          WindowOpenDisposition disposition,
                                          const gfx::Rect& initial_pos,
                                          bool user_gesture) = 0;
   virtual void ShowCreatedWidgetInternal(RenderWidgetHostView* widget_host_view,
                                          const gfx::Rect& initial_pos) = 0;
 
  private:
@@ skipping 16 matching lines @@
 
   // These maps hold on to the widgets that we created on behalf of the
   // renderer that haven't shown yet.
   typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews;
   PendingWidgetViews pending_widget_views_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsView);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_