diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 18:39:38 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 18:39:38 +0000 |
| commit | ee3724cc8eb917d0296562fd54d170273d3b8820 (patch) | |
| tree | fa10206563156f59ce8548c471e223eaf9be8d99 /views/accessibility | |
| parent | 0f4758f7f597d5f4b608f75aba2cec316d1b62b8 (diff) | |
| download | chromium_src-ee3724cc8eb917d0296562fd54d170273d3b8820.zip chromium_src-ee3724cc8eb917d0296562fd54d170273d3b8820.tar.gz chromium_src-ee3724cc8eb917d0296562fd54d170273d3b8820.tar.bz2 | |
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
Review URL: http://codereview.chromium.org/5075003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accessibility')
| -rw-r--r-- | views/accessibility/view_accessibility.cc | 11 | ||||
| -rw-r--r-- | views/accessibility/view_accessibility.h | 2 |
2 files changed, 7 insertions, 6 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(); } diff --git a/views/accessibility/view_accessibility.h b/views/accessibility/view_accessibility.h index 9803cba..66df163c 100644 --- a/views/accessibility/view_accessibility.h +++ b/views/accessibility/view_accessibility.h @@ -160,6 +160,6 @@ class ATL_NO_VTABLE ViewAccessibility DISALLOW_COPY_AND_ASSIGN(ViewAccessibility); }; -extern const wchar_t kViewsNativeHostPropForAccessibility[]; +extern const char kViewsNativeHostPropForAccessibility[]; #endif // VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_ |