diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:39:07 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:39:07 +0000 |
| commit | bb837f9287259862c94155cc59cfc9e1bdfe1258 (patch) | |
| tree | f23a7dabe56a4b4c9288ea022f65c090a4fc536b /chrome/browser/accessibility | |
| parent | d19e63d5bd3a61fc46bae0c527731c79abb94957 (diff) | |
| download | chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.zip chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.tar.gz chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.tar.bz2 | |
Revert 76825 - Refactor Views accessibility.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6581010
TBR=dmazzoni@chromium.org
Review URL: http://codereview.chromium.org/6612035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/accessibility')
| -rw-r--r-- | chrome/browser/accessibility/browser_views_accessibility_browsertest.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc index a498c36..40c60cb5d 100644 --- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc @@ -17,9 +17,8 @@ #include "chrome/test/ui_test_utils.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "ui/base/accessibility/accessibility_types.h" #include "ui/base/l10n/l10n_util.h" -#include "views/accessibility/native_view_accessibility_win.h" +#include "views/accessibility/view_accessibility.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" #include "views/window/window.h" @@ -29,7 +28,7 @@ namespace { VARIANT id_self = {VT_I4, CHILDID_SELF}; // Dummy class to force creation of ATL module, needed by COM to instantiate -// NativeViewAccessibilityWin. +// ViewAccessibility. class TestAtlModule : public CAtlDllModuleT<TestAtlModule> {}; TestAtlModule test_atl_module_; @@ -87,9 +86,7 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest { ASSERT_TRUE(NULL != view); TestAccessibilityInfo( - views::NativeViewAccessibilityWin::GetAccessibleForView(view), - name, - role); + ViewAccessibility::GetAccessibleForView(view), name, role); } @@ -256,8 +253,8 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, EXPECT_STREQ( aboutChromeWindow->GetDelegate()->GetWindowTitle().c_str(), UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)).c_str()); - EXPECT_EQ(aboutChromeWindow->GetDelegate()->GetAccessibleRole(), - ui::AccessibilityTypes::ROLE_DIALOG); + EXPECT_EQ(aboutChromeWindow->GetDelegate()->accessible_role(), + AccessibilityTypes::ROLE_DIALOG); // Also test the accessibility object directly. IAccessible* acc_obj = NULL; |