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

views/focus/focus_util_win.h

 // 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.
 
 #ifndef VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
 #define VIEWS_FOCUS_FOCUS_UTIL_WIN_H_
 #pragma once
 
 #include <windows.h>
 
 namespace app {
-class ViewProp;
+namespace win {
+class ScopedProp;
+}
 }
 
 namespace views {
 
 // Marks the passed |hwnd| as supporting mouse-wheel message rerouting.
 // We reroute the mouse wheel messages to such HWND when they are under the
-// mouse pointer (but are not the active window). Callers own the returned
-// object.
-app::ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
+// mouse pointer (but are not the active window). Callers must delete the
+// returned object before the window is destroyed (see ScopedProp for details).
+app::win::ScopedProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
 
 // Forwards mouse wheel messages to the window under it.
 // Windows sends mouse wheel messages to the currently active window.
 // This causes a window to scroll even if it is not currently under the mouse
 // wheel. The following code gives mouse wheel messages to the window under the
 // mouse wheel in order to scroll that window. This is arguably a better user
 // experience.  The returns value says whether the mouse wheel message was
 // successfully redirected.
 bool RerouteMouseWheel(HWND window, WPARAM w_param, LPARAM l_param);
 
 }   // namespace views
 
 #endif  // VIEWS_FOCUS_FOCUS_UTIL_WIN_H_