Adds the ability for classes other than native control to process

views/controls/native_control_win.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 #define VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
+#include "base/scoped_vector.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/native/native_view_host.h"
+#include "views/widget/child_window_message_processor.h"
 
 namespace app {
 namespace win {
 class ScopedProp;
 }
 }
 
 namespace views {
 
 // A View that hosts a native Windows control.
-class NativeControlWin : public NativeViewHost {
+class NativeControlWin : public ChildWindowMessageProcessor,
+                         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.
-  // Returns true if the message was handled, with a valid result in |result|.
-  // Returns false if the message was not handled.
+  // Overridden from ChildWindowMessageProcessor:
   virtual bool ProcessMessage(UINT message,
                               WPARAM w_param,
                               LPARAM l_param,
                               LRESULT* result);
 
   // Called by our subclassed window procedure when a WM_KEYDOWN message is
   // received by the HWND created by an object derived from NativeControlWin.
   // Returns true if the key was processed, false otherwise.
   virtual bool OnKeyDown(int vkey) { return false; }
 
@@ skipping 27 matching lines @@
   // to the HWND for views with right-to-left UI layout.
   DWORD GetAdditionalExStyle() const;
 
   // TODO(xji): we use the following temporary function as we transition the
   // various native controls to use the right set of RTL flags. This function
   // will go away (and be replaced by GetAdditionalExStyle()) once all the
   // controls are properly transitioned.
   DWORD GetAdditionalRTLStyle() const;
 
  private:
+  typedef ScopedVector<app::win::ScopedProp> ScopedProps;
+
   // Called by the containing WidgetWin when a message of type WM_CTLCOLORBTN or
   // WM_CTLCOLORSTATIC is sent from the HWND created by an object dreived from
   // NativeControlWin.
   LRESULT GetControlColor(UINT message, HDC dc, HWND sender);
 
   // Our subclass window procedure for the attached control.
   static LRESULT CALLBACK NativeControlWndProc(HWND window,
                                                UINT message,
                                                WPARAM w_param,
                                                LPARAM l_param);
 
   // The window procedure before we subclassed.
   WNDPROC original_wndproc_;
 
-  scoped_ptr<app::win::ScopedProp> prop_;
+  ScopedProps props_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeControlWin);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_