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

views/controls/native_control_win.h

 // Copyright (c) 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 VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 #define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 
-#include "views/controls/hwnd_view.h"
+#include "views/controls/native/native_view_host.h"
 
 namespace views {
 
 // A View that hosts a native Windows control.
-class NativeControlWin : public HWNDView {
+class NativeControlWin : public NativeViewHost {
  public:
   static const wchar_t* kNativeControlWinKey;
 
   NativeControlWin();
   virtual ~NativeControlWin();
 
   // Called by the containing WidgetWin when a message is received from the HWND
   // created by an object derived from NativeControlWin. Derived classes MUST
   // call _this_ version of the function if they override it and do not handle
   // all of the messages listed in widget_win.cc ProcessNativeControlWinMessage.
@@ skipping 29 matching lines @@
   // has been created.
   virtual bool NotifyOnKeyDown() const { return false; }
 
   // Called when the NativeControlWin is attached to a View hierarchy with a
   // valid Widget. The NativeControlWin should use this opportunity to create
   // its associated HWND.
   virtual void CreateNativeControl() = 0;
 
   // MUST be called by the subclass implementation of |CreateNativeControl|
   // immediately after creating the control HWND, otherwise it won't be attached
-  // to the HWNDView and will be effectively orphaned.
+  // to the NativeViewHost and will be effectively orphaned.
   virtual void NativeControlCreated(HWND native_control);
 
   // Returns additional extended style flags. When subclasses call
   // CreateWindowEx in order to create the underlying control, they must OR the
   // ExStyle parameter with the value returned by this function.
   //
   // We currently use this method in order to add flags such as WS_EX_LAYOUTRTL
   // to the HWND for views with right-to-left UI layout.
   DWORD GetAdditionalExStyle() const;
 
@@ skipping 17 matching lines @@
 
   // The window procedure before we subclassed.
   static WNDPROC original_wndproc_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeControlWin);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_