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/ui/views/tabs/base_tab.cc | |
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/ui/views/tabs/base_tab.cc')
-rw-r--r-- | chrome/browser/ui/views/tabs/base_tab.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index e4a2643..9c99e47 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -9,15 +9,14 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tabs/tab_controller.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "content/browser/tab_contents/tab_contents.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/l10n/l10n_util.h" @@ -213,6 +212,9 @@ void BaseTab::SetData(const TabRendererData& data) { ResetCrashedFavIcon(); } + // Sets the accessible name for the tab. + SetAccessibleName(data_.title); + DataChanged(old); Layout(); @@ -346,12 +348,11 @@ bool BaseTab::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { return false; } -void BaseTab::GetAccessibleState(ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_PAGETAB; - state->name = data_.title; +AccessibilityTypes::Role BaseTab::GetAccessibleRole() { + return AccessibilityTypes::ROLE_PAGETAB; } -ui::ThemeProvider* BaseTab::GetThemeProvider() const { +ui::ThemeProvider* BaseTab::GetThemeProvider() { ui::ThemeProvider* tp = View::GetThemeProvider(); return tp ? tp : theme_provider_; } |