Adds the ability for classes other than native control to process

views/controls/native_control_win.cc

 // Copyright (c) 2010 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 <windowsx.h>
 
 #include "app/l10n_util_win.h"
 #include "app/win/scoped_prop.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "views/focus/focus_manager.h"
 
 namespace views {
 
-// static
-const wchar_t* NativeControlWin::kNativeControlWinKey =
-    L"__NATIVE_CONTROL_WIN__";
+static const wchar_t* kNativeControlWinKey = L"__NATIVE_CONTROL_WIN__";
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, public:
 
 NativeControlWin::NativeControlWin() {
 }
 
 NativeControlWin::~NativeControlWin() {
   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) {
+bool NativeControlWin::ProcessMessage(UINT message,
+                                      WPARAM w_param,
+                                      LPARAM l_param,
+                                      LRESULT* result) {
   switch (message) {
     case WM_CONTEXTMENU:
       ShowContextMenu(gfx::Point(GET_X_LPARAM(l_param), GET_Y_LPARAM(l_param)));
       *result = 0;
       return true;
     case WM_CTLCOLORBTN:
     case WM_CTLCOLORSTATIC:
       *result = GetControlColor(message, reinterpret_cast<HDC>(w_param),
                                 native_view());
       return true;
@@ skipping 73 matching lines @@
 
   if (location.x() == -1 && location.y() == -1)
     View::ShowContextMenu(GetKeyboardContextMenuLocation(), false);
   else
     View::ShowContextMenu(location, true);
 }
 
 void NativeControlWin::NativeControlCreated(HWND native_control) {
   // Associate this object with the control's HWND so that WidgetWin can find
   // this object when it receives messages from it.
-  prop_.reset(
+  props_.push_back(
       new app::win::ScopedProp(native_control, kNativeControlWinKey, this));
+  props_.push_back(ChildWindowMessageProcessor::Register(native_control, this));
 
   // Subclass so we get WM_KEYDOWN and WM_SETFOCUS messages.
   original_wndproc_ =
       win_util::SetWindowProc(native_control,
                               &NativeControlWin::NativeControlWndProc);
 
   Attach(native_control);
   // native_view() is now valid.
 
   // Update the newly created HWND with any resident enabled state.
@@ skipping 59 matching lines @@
       return 0;
   } else if (message == WM_SETFOCUS) {
     // Let the focus manager know that the focus changed.
     FocusManager* focus_manager = native_control->GetFocusManager();
     if (focus_manager) {
       focus_manager->SetFocusedView(native_control->focus_view());
     } else {
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
-    native_control->prop_.reset();
+    native_control->props_.reset();
     win_util::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views