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

views/controls/native_control_win.cc

 // 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.
 
 #include "views/controls/native_control_win.h"
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 
 namespace views {
 
 // static
 const wchar_t* NativeControlWin::kNativeControlWinKey =
     L"__NATIVE_CONTROL_WIN__";
 
 static const wchar_t* kNativeControlOriginalWndProcKey =
     L"__NATIVE_CONTROL_ORIGINAL_WNDPROC__";
 
 // static
 WNDPROC NativeControlWin::original_wndproc_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, public:
 
-NativeControlWin::NativeControlWin() : HWNDView() {
+NativeControlWin::NativeControlWin() {
 }
 
 NativeControlWin::~NativeControlWin() {
-  HWND hwnd = GetHWND();
+  HWND hwnd = native_view();
   if (hwnd) {
     // Destroy the hwnd if it still exists. Otherwise we won't have shut things
     // down correctly, leading to leaking and crashing if another message
     // comes in for the hwnd.
     Detach();
     DestroyWindow(hwnd);
   }
 }
 
 bool NativeControlWin::ProcessMessage(UINT message, WPARAM w_param,
                                       LPARAM l_param, LRESULT* result) {
   switch (message) {
     case WM_CONTEXTMENU:
       ShowContextMenu(gfx::Point(LOWORD(l_param), HIWORD(l_param)));
       *result = 0;
       return true;
     case WM_CTLCOLORBTN:
     case WM_CTLCOLORSTATIC:
       *result = GetControlColor(message, reinterpret_cast<HDC>(w_param),
-                                GetHWND());
+                                native_view());
       return true;
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, View overrides:
 
 void NativeControlWin::SetEnabled(bool enabled) {
   if (IsEnabled() != enabled) {
     View::SetEnabled(enabled);
-    if (GetHWND())
-      EnableWindow(GetHWND(), IsEnabled());
+    if (native_view())
+      EnableWindow(native_view(), IsEnabled());
   }
 }
 
 void NativeControlWin::ViewHierarchyChanged(bool is_add, View* parent,
                                             View* child) {
+  // Call the base class to hide the view if we're being removed.
+  NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
+
   // Create the HWND when we're added to a valid Widget. Many controls need a
   // parent HWND to function properly.
-  if (is_add && GetWidget() && !GetHWND())
+  if (is_add && GetWidget() && !native_view())
     CreateNativeControl();
-
-  // Call the base class to hide the view if we're being removed.
-  HWNDView::ViewHierarchyChanged(is_add, parent, child);
 }
 
 void NativeControlWin::VisibilityChanged(View* starting_from, bool is_visible) {
   if (!is_visible) {
     // We destroy the child control HWND when we become invisible because of the
     // performance cost of maintaining many HWNDs.
-    HWND hwnd = GetHWND();
+    HWND hwnd = native_view();
     Detach();
     DestroyWindow(hwnd);
-  } else if (!GetHWND()) {
+  } else if (!native_view()) {
     CreateNativeControl();
   }
 }
 
 void NativeControlWin::Focus() {
-  DCHECK(GetHWND());
-  SetFocus(GetHWND());
+  DCHECK(native_view());
+  SetFocus(native_view());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, protected:
 
 void NativeControlWin::ShowContextMenu(const gfx::Point& location) {
   if (!GetContextMenuController())
     return;
 
   int x = location.x();
@@ skipping 13 matching lines @@
   // this object when it receives messages from it.
   SetProp(native_control, kNativeControlWinKey, this);
 
   // Subclass the window so we can monitor for key presses.
   original_wndproc_ =
       win_util::SetWindowProc(native_control,
                               &NativeControlWin::NativeControlWndProc);
   SetProp(native_control, kNativeControlOriginalWndProcKey, original_wndproc_);
 
   Attach(native_control);
-  // GetHWND() is now valid.
+  // native_view() is now valid.
 
   // Update the newly created HWND with any resident enabled state.
-  EnableWindow(GetHWND(), IsEnabled());
+  EnableWindow(native_view(), IsEnabled());
 
   // This message ensures that the focus border is shown.
-  SendMessage(GetHWND(), WM_CHANGEUISTATE,
+  SendMessage(native_view(), WM_CHANGEUISTATE,
               MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0);
 }
 
 DWORD NativeControlWin::GetAdditionalExStyle() const {
   // If the UI for the view is mirrored, we should make sure we add the
   // extended window style for a right-to-left layout so the subclass creates
   // a mirrored HWND for the underlying control.
   DWORD ex_style = 0;
   if (UILayoutIsRightToLeft())
     ex_style |= l10n_util::GetExtendedStyles();
@@ skipping 46 matching lines @@
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window, native_control->original_wndproc_);
     RemoveProp(window, kNativeControlWinKey);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views