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

chrome/browser/renderer_host/render_widget_host_view_win.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 "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
-#include "app/view_prop.h"
 #include "app/win/scoped_prop.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
 #include "base/scoped_comptr_win.h"
 #include "base/thread.h"
 #include "base/win_util.h"
 #include "chrome/browser/accessibility/browser_accessibility_win.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 24 matching lines @@
 #include "views/focus/focus_manager.h"
 #include "views/focus/focus_util_win.h"
 // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
 #include "views/widget/widget_win.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor.h"
 
-using app::ViewProp;
 using base::TimeDelta;
 using base::TimeTicks;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseEvent;
 using WebKit::WebTextDirection;
 using webkit_glue::WebPluginGeometry;
 
 namespace {
 
 // Tooltips will wrap after this width. Yes, wrap. Imagine that!
 const int kTooltipMaxWidthPixels = 300;
 
 // Maximum number of characters we allow in a tooltip.
 const int kMaxTooltipLength = 1024;
 
 // A custom MSAA object id used to determine if a screen reader is actively
 // listening for MSAA events.
 const int kIdCustom = 1;
 
-const char* const kRenderWidgetHostViewKey = "__RENDER_WIDGET_HOST_VIEW__";
+const wchar_t* kRenderWidgetHostViewKey = L"__RENDER_WIDGET_HOST_VIEW__";
 
 // A callback function for EnumThreadWindows to enumerate and dismiss
 // any owned popop windows
 BOOL CALLBACK DismissOwnedPopups(HWND window, LPARAM arg) {
   const HWND toplevel_hwnd = reinterpret_cast<HWND>(arg);
 
   if (::IsWindowVisible(window)) {
     const HWND owner = ::GetWindow(window, GW_OWNER);
     if (toplevel_hwnd == owner) {
       ::PostMessage(window, WM_CANCELMODE, 0, 0);
@@ skipping 216 matching lines @@
 
 RenderWidgetHostViewWin::~RenderWidgetHostViewWin() {
   ResetTooltip();
 }
 
 void RenderWidgetHostViewWin::CreateWnd(HWND parent) {
   Create(parent);  // ATL function to create the window.
 
   // Add a property indicating that a particular renderer is associated with
   // this window. Used by the GPU process to validate window handles it
-  // receives from renderer processes. As this is used by a separate process we
-  // have to use ScopedProp here instead of ViewProp.
+  // receives from renderer processes.
   int renderer_id = render_widget_host_->process()->id();
-  renderer_id_prop_.reset(
+  props_.push_back(
       new app::win::ScopedProp(m_hWnd,
                                chrome::kChromiumRendererIdProperty,
                                reinterpret_cast<HANDLE>(renderer_id)));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, RenderWidgetHostView implementation:
 
 void RenderWidgetHostViewWin::InitAsPopup(
     RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) {
@@ skipping 467 matching lines @@
 
 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale
   // of a browser process.
   OnInputLangChange(0, 0);
   // Marks that window as supporting mouse-wheel messages rerouting so it is
   // scrolled when under the mouse pointer even if inactive.
   props_.push_back(views::SetWindowSupportsRerouteMouseWheel(m_hWnd));
   // Save away our HWND in the parent window as a property so that the
   // accessibility code can find it.
-  props_.push_back(new ViewProp(GetParent(),
-                                kViewsNativeHostPropForAccessibility,
-                                m_hWnd));
-  props_.push_back(new ViewProp(m_hWnd, kRenderWidgetHostViewKey,
-                                static_cast<RenderWidgetHostView*>(this)));
+  props_.push_back(new app::win::ScopedProp(
+                       GetParent(), kViewsNativeHostPropForAccessibility,
+                       m_hWnd));
+  props_.push_back(new app::win::ScopedProp(
+                       m_hWnd, kRenderWidgetHostViewKey,
+                       static_cast<RenderWidgetHostView*>(this)));
   return 0;
 }
 
 void RenderWidgetHostViewWin::OnActivate(UINT action, BOOL minimized,
                                          HWND window) {
   // If the container is a popup, clicking elsewhere on screen should close the
   // popup.
   if (close_on_deactivate_ && action == WA_INACTIVE) {
     // Send a windows message so that any derived classes
     // will get a change to override the default handling
@@ skipping 10 matching lines @@
   // as they have plugin instances active. Quicktime crashes in this case
   // because its windowing code cleans up an internal data structure that the
   // handler for NPP_DestroyStream relies on.
   //
   // The fix is to detach plugin windows from web contents when it is going
   // away. This will prevent the plugin windows from getting destroyed
   // automatically. The detached plugin windows will get cleaned up in proper
   // sequence as part of the usual cleanup when the plugin instance goes away.
   EnumChildWindows(m_hWnd, DetachPluginWindowsCallback, NULL);
 
-  renderer_id_prop_.reset();
   props_.reset();
 
   ResetTooltip();
   TrackMouseLeave(false);
 }
 
 void RenderWidgetHostViewWin::OnPaint(HDC unused_dc) {
   DCHECK(render_widget_host_->process()->HasConnection());
 
   // If the GPU process is rendering directly into the View,
@@ skipping 781 matching lines @@
   shutdown_factory_.RevokeAll();
   if (render_widget_host_)
     render_widget_host_->Shutdown();
   // Do not touch any members at this point, |this| has been deleted.
 }
 
 // static
 RenderWidgetHostView*
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
-  return ::IsWindow(native_view) ?
-      reinterpret_cast<RenderWidgetHostView*>(
-          ViewProp::GetValue(native_view, kRenderWidgetHostViewKey)) : NULL;
+  if (::IsWindow(native_view)) {
+    HANDLE raw_render_host_view = ::GetProp(native_view,
+                                            kRenderWidgetHostViewKey);
+    if (raw_render_host_view)
+      return reinterpret_cast<RenderWidgetHostView*>(raw_render_host_view);
+  }
+  return NULL;
 }