summaryrefslogtreecommitdiffstats
path: root/views/accessibility/view_accessibility.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-21 22:44:21 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-21 22:44:21 +0000
commit3b8a7f8e37e223f3cfbdb6893a3e372ba1e72bc2 (patch)
treedbcc9e25653efaa6d7b3fd0b646f56123f72f8f2 /views/accessibility/view_accessibility.cc
parent294b014b3743b8a359d423ab238d2ea2872cf629 (diff)
downloadchromium_src-3b8a7f8e37e223f3cfbdb6893a3e372ba1e72bc2.zip
chromium_src-3b8a7f8e37e223f3cfbdb6893a3e372ba1e72bc2.tar.gz
chromium_src-3b8a7f8e37e223f3cfbdb6893a3e372ba1e72bc2.tar.bz2
Attempt 2 at:
Converts usage of SetProp/GetProp to a map. Even after making sure we clean up props we still leak in a handful of cases that are causing test grief. By and large our usage of properties is for inside the application, so that a map works fine. BUG=61528 44991 TEST=none TBR=cpu@chromium.org Review URL: http://codereview.chromium.org/5144005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accessibility/view_accessibility.cc')
-rw-r--r--views/accessibility/view_accessibility.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc
index c092895..5d51d814 100644
--- a/views/accessibility/view_accessibility.cc
+++ b/views/accessibility/view_accessibility.cc
@@ -4,11 +4,12 @@
#include "views/accessibility/view_accessibility.h"
+#include "app/view_prop.h"
#include "views/widget/widget.h"
#include "views/widget/widget_win.h"
-const wchar_t kViewsNativeHostPropForAccessibility[] =
- L"Views_NativeViewHostHWNDForAccessibility";
+const char kViewsNativeHostPropForAccessibility[] =
+ "Views_NativeViewHostHWNDForAccessibility";
// static
scoped_refptr<ViewAccessibility> ViewAccessibility::Create(views::View* view) {
@@ -710,9 +711,9 @@ HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
if (!native_host || !accessible)
return E_INVALIDARG;
- HWND native_view_window =
- static_cast<HWND>(GetProp(native_host->native_view(),
- kViewsNativeHostPropForAccessibility));
+ HWND native_view_window = static_cast<HWND>(
+ app::ViewProp::GetValue(native_host->native_view(),
+ kViewsNativeHostPropForAccessibility));
if (!IsWindow(native_view_window)) {
native_view_window = native_host->native_view();
}