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

views/focus/focus_util_win.cc

 // Copyright (c) 2009 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/focus/focus_util_win.h"
 
 #include <windowsx.h>
 
-#include "app/view_prop.h"
+#include "app/win/scoped_prop.h"
 #include "base/auto_reset.h"
 #include "base/win_util.h"
 
-using app::ViewProp;
-
 namespace views {
 
 // Property used to indicate the HWND supports having mouse wheel messages
 // rerouted to it.
-static const char* const kHWNDSupportMouseWheelRerouting =
-    "__HWND_MW_REROUTE_OK";
+static const wchar_t* const kHWNDSupportMouseWheelRerouting =
+    L"__HWND_MW_REROUTE_OK";
 
 static bool WindowSupportsRerouteMouseWheel(HWND window) {
   while (GetWindowLong(window, GWL_STYLE) & WS_CHILD) {
     if (!IsWindow(window))
       break;
 
-    if (reinterpret_cast<bool>(
-            ViewProp::GetValue(window, kHWNDSupportMouseWheelRerouting))) {
+    if (reinterpret_cast<bool>(GetProp(window,
+                                       kHWNDSupportMouseWheelRerouting))) {
       return true;
     }
     window = GetParent(window);
   }
   return false;
 }
 
 static bool IsCompatibleWithMouseWheelRedirection(HWND window) {
   std::wstring class_name = win_util::GetClassName(window);
   // Mousewheel redirection to comboboxes is a surprising and
   // undesireable user behavior.
   return !(class_name == L"ComboBox" ||
            class_name == L"ComboBoxEx32");
 }
 
 static bool CanRedirectMouseWheelFrom(HWND window) {
   std::wstring class_name = win_util::GetClassName(window);
 
   // Older Thinkpad mouse wheel drivers create a window under mouse wheel
   // pointer. Detect if we are dealing with this window. In this case we
   // don't need to do anything as the Thinkpad mouse driver will send
   // mouse wheel messages to the right window.
   if ((class_name == L"Syn Visual Class") ||
      (class_name == L"SynTrackCursorWindowClass"))
     return false;
 
   return true;
 }
 
-ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd) {
-  return new ViewProp(hwnd, kHWNDSupportMouseWheelRerouting,
-                      reinterpret_cast<HANDLE>(true));
+app::win::ScopedProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd) {
+  return new app::win::ScopedProp(hwnd, kHWNDSupportMouseWheelRerouting,
+                                  reinterpret_cast<HANDLE>(true));
 }
 
 bool RerouteMouseWheel(HWND window, WPARAM w_param, LPARAM l_param) {
   // Since this is called from a subclass for every window, we can get
   // here recursively. This will happen if, for example, a control
   // reflects wheel scroll messages to its parent. Bail out if we got
   // here recursively.
   static bool recursion_break = false;
   if (recursion_break)
     return false;
@@ skipping 41 matching lines @@
     }
     // If redirection is disallowed, try the parent.
     window_under_wheel = GetAncestor(window_under_wheel, GA_PARENT);
   }
   // If we traversed back to the starting point, we should process
   // this message normally; return false.
   return false;
 }
 
 }  // namespace views