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

views/widget/widget_win.h

Index: views/widget/widget_win.h
===================================================================
--- views/widget/widget_win.h	(revision 66785)
+++ views/widget/widget_win.h	(working copy)
@@ -23,8 +23,10 @@
 #include "views/widget/widget.h"
 
 namespace app {
-class ViewProp;
+namespace win {
+class ScopedProp;
 }
+}
 
 namespace gfx {
 class CanvasSkia;
@@ -232,8 +234,9 @@
   virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
-  virtual void SetNativeWindowProperty(const char* name, void* value);
-  virtual void* GetNativeWindowProperty(const char* name);
+  virtual void SetNativeWindowProperty(const std::wstring& name,
+                                       void* value);
+  virtual void* GetNativeWindowProperty(const std::wstring& name);
   virtual ThemeProvider* GetThemeProvider() const;
   virtual ThemeProvider* GetDefaultThemeProvider() const;
   virtual FocusManager* GetFocusManager();
@@ -484,7 +487,7 @@
   bool is_window_;
 
  private:
-  typedef ScopedVector<app::ViewProp> ViewProps;
+  typedef ScopedVector<app::win::ScopedProp> ScopedProps;
 
   // Implementation of GetWindow. Ascends the parents of |hwnd| returning the
   // first ancestor that is a Window.
@@ -592,7 +595,7 @@
   // we always mod this value with the max view events above .
   int accessibility_view_events_index_;
 
-  ViewProps props_;
+  ScopedProps props_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetWin);
 };