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

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 {
-class ViewProp;
+namespace win {
+class ScopedProp;
+}
 }
 
 namespace views {
 
 // A View that hosts a native Windows control.
 class NativeControlWin : public ChildWindowMessageProcessor,
                          public NativeViewHost {
  public:
   NativeControlWin();
   virtual ~NativeControlWin();
@@ skipping 39 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::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
   // 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_;
 
-  ViewProps props_;
+  ScopedProps props_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeControlWin);
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_CONTROLS_NATIVE_CONTROL_WIN_H_