Refactors HWNDView, NativeViewHostGtk and NativeViewHost so that they match t...

chrome/browser/extensions/extension_view.h

 // Copyright (c) 2006-2009 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_EXTENSIONS_EXTENSION_VIEW_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_H_
 
 #include "build/build_config.h"
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-
-// TODO(port): Port these files.
-#if defined(OS_WIN)
-#include "views/controls/hwnd_view.h"
-#else
-#include "views/view.h"
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
+#include "views/controls/native/native_view_host.h"
 
 class Browser;
 class Extension;
 
 // A class that represents the container that this view is in.
 // (bottom shelf, side bar, etc.)
 class ExtensionContainer {
  public:
   // Mouse event notifications from the view. (useful for hover UI).
   virtual void OnExtensionMouseEvent(ExtensionView* view) = 0;
   virtual void OnExtensionMouseLeave(ExtensionView* view) = 0;
 };
 
 // This handles the display portion of an ExtensionHost.
-class ExtensionView : public views::HWNDView {
+class ExtensionView : public views::NativeViewHost {
  public:
   ExtensionView(ExtensionHost* host, Browser* browser, const GURL& content_url);
   ~ExtensionView();
 
   ExtensionHost* host() const { return host_.get(); }
   Browser* browser() const { return browser_; }
   Extension* extension() { return host_->extension(); }
   RenderViewHost* render_view_host() { return host_->render_view_host(); }
 
   // Notification from ExtensionHost.
   void DidContentsPreferredWidthChange(const int pref_width);
   void HandleMouseEvent();
   void HandleMouseLeave();
 
   // Set a custom background for the view. The background will be tiled.
   void SetBackground(const SkBitmap& background);
 
   // Sets the container for this view.
   void SetContainer(ExtensionContainer* container) { container_ = container; }
 
-  // views::HWNDView
+  // Overridden from views::NativeViewHost:
   virtual void SetVisible(bool is_visible);
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View *parent, views::View *child);
 
  private:
   friend class ExtensionHost;
 
   // We wait to show the ExtensionView until several things have loaded.
@@ skipping 20 matching lines @@
   int pending_preferred_width_;
 
   // The container this view is in (not necessarily its direct superview).
   // Note: the view does not own its container.
   ExtensionContainer* container_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionView);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_H_