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

views/controls/native_control.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.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
 #include <atlmisc.h>
 
 #include "app/keyboard_code_conversion_win.h"
 #include "app/keyboard_codes.h"
 #include "app/l10n_util_win.h"
-#include "app/view_prop.h"
+#include "app/win/scoped_prop.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/win_util.h"
 #include "gfx/native_theme_win.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
-using app::ViewProp;
-
 namespace views {
 
 // Maps to the NativeControl.
-static const char* const kNativeControlKey = "__NATIVE_CONTROL__";
+static const wchar_t* const kNativeControlKey = L"__NATIVE_CONTROL__";
 
 class NativeControlContainer : public CWindowImpl<NativeControlContainer,
                                CWindow,
                                CWinTraits<WS_CHILD | WS_CLIPSIBLINGS |
                                           WS_CLIPCHILDREN>> {
  public:
   explicit NativeControlContainer(NativeControl* parent)
       : parent_(parent),
         control_(NULL),
         original_handler_(NULL) {
@@ skipping 41 matching lines @@
 
  private:
   friend class NativeControl;
 
   LRESULT OnCreate(LPCREATESTRUCT create_struct) {
     control_ = parent_->CreateNativeControl(m_hWnd);
 
     // We subclass the control hwnd so we get the WM_KEYDOWN messages.
     original_handler_ = win_util::SetWindowProc(
         control_, &NativeControl::NativeControlWndProc);
-    prop_.reset(new ViewProp(control_, kNativeControlKey , parent_));
+    prop_.reset(
+        new app::win::ScopedProp(control_, kNativeControlKey , parent_));
 
     ::ShowWindow(control_, SW_SHOW);
     return 1;
   }
 
   LRESULT OnEraseBkgnd(HDC dc) {
     return 1;
   }
 
   void OnPaint(HDC ignore) {
@@ skipping 55 matching lines @@
   LRESULT OnCtlColorStatic(HDC dc, HWND control) {
     return OnCtlColor(WM_CTLCOLORSTATIC, dc, control);
   }
 
   NativeControl* parent_;
   HWND control_;
 
   // Message handler that was set before we reset it.
   WNDPROC original_handler_;
 
-  scoped_ptr<ViewProp> prop_;
+  scoped_ptr<app::win::ScopedProp> prop_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeControlContainer);
 };
 
 NativeControl::NativeControl() : hwnd_view_(NULL),
                                  container_(NULL),
                                  fixed_width_(-1),
                                  horizontal_alignment_(CENTER),
                                  fixed_height_(-1),
                                  vertical_alignment_(CENTER) {
@@ skipping 176 matching lines @@
     ex_style |= l10n_util::GetExtendedTooltipStyles();
 
   return ex_style;
 }
 
 // static
 LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window,
                                                      UINT message,
                                                      WPARAM w_param,
                                                      LPARAM l_param) {
-  NativeControl* native_control = static_cast<NativeControl*>(
-      ViewProp::GetValue(window, kNativeControlKey));
+  NativeControl* native_control =
+      static_cast<NativeControl*>(GetProp(window, kNativeControlKey));
   DCHECK(native_control);
   WNDPROC original_handler = native_control->container_->original_handler_;
   DCHECK(original_handler);
 
   if (message == WM_KEYDOWN &&
       native_control->OnKeyDown(app::KeyboardCodeForWindowsKeyCode(w_param))) {
     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);
     } else {
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window,
                             reinterpret_cast<WNDPROC>(original_handler));
     native_control->container_->prop_.reset();
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views