diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 18:47:05 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 18:47:05 +0000 |
| commit | 28164cbf4787643ad22efc12b439ba0cff93cc63 (patch) | |
| tree | dc6b1ecd04b34252755b6b6452859cb6ee6ad667 /views/accessibility | |
| parent | 416ed618e916018bb154acd52fd39ca1198efd22 (diff) | |
| download | chromium_src-28164cbf4787643ad22efc12b439ba0cff93cc63.zip chromium_src-28164cbf4787643ad22efc12b439ba0cff93cc63.tar.gz chromium_src-28164cbf4787643ad22efc12b439ba0cff93cc63.tar.bz2 | |
Revert 66784 - 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
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/5184009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66786 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, 6 insertions, 7 deletions
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc index 5d51d814..c092895 100644 --- a/views/accessibility/view_accessibility.cc +++ b/views/accessibility/view_accessibility.cc @@ -4,12 +4,11 @@ #include "views/accessibility/view_accessibility.h" -#include "app/view_prop.h" #include "views/widget/widget.h" #include "views/widget/widget_win.h" -const char kViewsNativeHostPropForAccessibility[] = - "Views_NativeViewHostHWNDForAccessibility"; +const wchar_t kViewsNativeHostPropForAccessibility[] = + L"Views_NativeViewHostHWNDForAccessibility"; // static scoped_refptr<ViewAccessibility> ViewAccessibility::Create(views::View* view) { @@ -711,9 +710,9 @@ HRESULT ViewAccessibility::GetNativeIAccessibleInterface( if (!native_host || !accessible) return E_INVALIDARG; - HWND native_view_window = static_cast<HWND>( - app::ViewProp::GetValue(native_host->native_view(), - kViewsNativeHostPropForAccessibility)); + HWND native_view_window = + static_cast<HWND>(GetProp(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 66df163c..9803cba 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 char kViewsNativeHostPropForAccessibility[]; +extern const wchar_t kViewsNativeHostPropForAccessibility[]; #endif // VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_ |