From 2b19e2feeac2a01b2068595bd2913a194a6527e5 Mon Sep 17 00:00:00 2001
From: "twiz@chromium.org"
 <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 16 Feb 2010 02:24:18 +0000
Subject: Clone of issue 600130. (http://codereview.chromium.org/600130)

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/593111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39077 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/external_tab_container.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'chrome/browser/external_tab_container.cc')

diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 9e098fd..837d006 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -256,7 +256,7 @@ void ExternalTabContainer::FocusThroughTabTraversal(bool reverse) {
 
 // static
 bool ExternalTabContainer::IsExternalTabContainer(HWND window) {
-  if (GetProp(window, kWindowObjectKey) != NULL)
+  if (::GetProp(window, kWindowObjectKey) != NULL)
     return true;
 
   return false;
@@ -277,6 +277,17 @@ ExternalTabContainer* ExternalTabContainer::GetContainerForTab(
   return container;
 }
 
+// static
+ExternalTabContainer*
+    ExternalTabContainer::GetExternalContainerFromNativeWindow(
+        gfx::NativeView native_window) {
+  ExternalTabContainer* tab_container = NULL;
+  if (native_window) {
+    HANDLE handle = ::GetProp(native_window, kWindowObjectKey);
+    tab_container = reinterpret_cast<ExternalTabContainer*>(handle);
+  }
+  return tab_container;
+}
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, TabContentsDelegate implementation:
 
-- 
cgit v1.1