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

chrome/browser/external_tab_container_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/external_tab_container_win.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
-#include "app/view_prop.h"
+#include "app/win/scoped_prop.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_extension_function.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/debugger/devtools_manager.h"
@@ skipping 19 matching lines @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/grid_layout.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
 
-using app::ViewProp;
-
-static const char kWindowObjectKey[] = "ChromeWindowObject";
+static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject";
 
 // This class overrides the LinkActivated function in the PageInfoBubbleView
 // class and routes the help center link navigation to the host browser.
 class ExternalTabPageInfoBubbleView : public PageInfoBubbleView {
  public:
   ExternalTabPageInfoBubbleView(ExternalTabContainer* container,
                                 gfx::NativeWindow parent_window,
                                 Profile* profile,
                                 const GURL& url,
                                 const NavigationEntry::SSLStatus& ssl,
@@ skipping 66 matching lines @@
 
   set_window_style(WS_POPUP | WS_CLIPCHILDREN);
   views::WidgetWin::Init(NULL, bounds);
   if (!IsWindow()) {
     NOTREACHED();
     return false;
   }
 
   // TODO(jcampan): limit focus traversal to contents.
 
-  prop_.reset(new ViewProp(GetNativeView(), kWindowObjectKey, this));
+  prop_.reset(
+      new app::win::ScopedProp(GetNativeView(), kWindowObjectKey, this));
 
   if (existing_contents) {
     tab_contents_ = existing_contents;
     tab_contents_->controller().set_profile(profile);
   } else {
     tab_contents_ = new TabContents(profile, NULL, MSG_ROUTING_NONE,
                                     NULL, NULL);
   }
 
   tab_contents_->set_delegate(this);
@@ skipping 128 matching lines @@
   // The tab_contents_ member can get destroyed in the context of the call to
   // TabContentsViewWin::Focus() above. This method eventually calls SetFocus
   // on the native window, which could end up dispatching messages like
   // WM_DESTROY for the external tab.
   if (tab_contents_ && restore_focus_to_view)
     tab_contents_->FocusThroughTabTraversal(reverse);
 }
 
 // static
 bool ExternalTabContainer::IsExternalTabContainer(HWND window) {
-  return ViewProp::GetValue(window, kWindowObjectKey) != NULL;
+  if (::GetProp(window, kWindowObjectKey) != NULL)
+    return true;
+
+  return false;
 }
 
 // static
 ExternalTabContainer* ExternalTabContainer::GetContainerForTab(
     HWND tab_window) {
   HWND parent_window = ::GetParent(tab_window);
   if (!::IsWindow(parent_window)) {
     return NULL;
   }
   if (!IsExternalTabContainer(parent_window)) {
     return NULL;
   }
   ExternalTabContainer* container = reinterpret_cast<ExternalTabContainer*>(
-      ViewProp::GetValue(parent_window, kWindowObjectKey));
+      GetProp(parent_window, kWindowObjectKey));
   return container;
 }
 
 // static
 ExternalTabContainer*
     ExternalTabContainer::GetExternalContainerFromNativeWindow(
         gfx::NativeView native_window) {
   ExternalTabContainer* tab_container = NULL;
   if (native_window) {
-    tab_container = reinterpret_cast<ExternalTabContainer*>(
-        ViewProp::GetValue(native_window, kWindowObjectKey));
+    HANDLE handle = ::GetProp(native_window, kWindowObjectKey);
+    tab_container = reinterpret_cast<ExternalTabContainer*>(handle);
   }
   return tab_container;
 }
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, TabContentsDelegate implementation:
 
 void ExternalTabContainer::OpenURLFromTab(TabContents* source,
                                           const GURL& url,
                                           const GURL& referrer,
                                           WindowOpenDisposition disposition,
@@ skipping 782 matching lines @@
 
   if (disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     disposition = NEW_FOREGROUND_TAB;
   }
   ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
                                        transition);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
 }