Revert 66784 - Converts usage of SetProp/GetProp to a map. Even after making sure we

clean up props we still leak in a handful of cases that are causing
test grief. By and large our usage of properties is for inside the
application, so that a map works fine.

BUG=61528 44991

Review URL: http://codereview.chromium.org/5075003

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/5184009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66786 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h
index d27efa4..3733a15 100644
--- a/views/controls/native_control_win.h
+++ b/views/controls/native_control_win.h
@@ -13,7 +13,9 @@
 #include "views/widget/child_window_message_processor.h"
 
 namespace app {
-class ViewProp;
+namespace win {
+class ScopedProp;
+}
 }
 
 namespace views {
@@ -73,7 +75,7 @@ class NativeControlWin : public ChildWindowMessageProcessor,
   DWORD GetAdditionalRTLStyle() const;
 
  private:
-  typedef ScopedVector<app::ViewProp> ViewProps;
+  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
@@ -89,7 +91,7 @@ class NativeControlWin : public ChildWindowMessageProcessor,
   // The window procedure before we subclassed.
   WNDPROC original_wndproc_;
 
-  ViewProps props_;
+  ScopedProps props_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeControlWin);
 };