diff options
Diffstat (limited to 'chrome/browser/ui/views/bookmarks')
9 files changed, 17 insertions, 18 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc index d13c063..b76c1f6 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc @@ -11,7 +11,7 @@ #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h" #include "grit/generated_resources.h" -#include "ui/base/accessibility/accessible_view_state.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/theme_provider.h" #include "ui/views/controls/label.h" @@ -98,8 +98,8 @@ void BookmarkBarInstructionsView::ViewHierarchyChanged( } void BookmarkBarInstructionsView::GetAccessibleState( - ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_GROUPING; + ui::AXViewState* state) { + state->role = ui::AX_ROLE_GROUP; } void BookmarkBarInstructionsView::LinkClicked(views::Link* source, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index d5b93a7..090c2b0 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -36,7 +36,7 @@ class BookmarkBarInstructionsView : public views::View, virtual void OnThemeChanged() OVERRIDE; virtual void ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // views::LinkListener overrides. virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 6aa0130..ebaf328 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -61,7 +61,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "ui/base/accessibility/accessible_view_state.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/l10n/l10n_util.h" @@ -402,9 +402,9 @@ class BookmarkBarView::ButtonSeparatorView : public views::View { return gfx::Size(kSeparatorWidth, 1); } - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR); - state->role = ui::AccessibilityTypes::ROLE_SEPARATOR; + state->role = ui::AX_ROLE_SPLITTER; } private: @@ -919,8 +919,8 @@ const char* BookmarkBarView::GetClassName() const { return kViewClassName; } -void BookmarkBarView::GetAccessibleState(ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_TOOLBAR; +void BookmarkBarView::GetAccessibleState(ui::AXViewState* state) { + state->role = ui::AX_ROLE_TOOLBAR; state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 6e166fa..3bdb513 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -182,7 +182,7 @@ class BookmarkBarView : public DetachableToolbarView, virtual const char* GetClassName() const OVERRIDE; // AccessiblePaneView: - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // gfx::AnimationDelegate: virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 220b428..f9c3842 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -32,7 +32,6 @@ #include "content/public/browser/page_navigator.h" #include "content/public/test/test_browser_thread.h" #include "grit/generated_resources.h" -#include "ui/base/accessibility/accessibility_types.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/test/ui_controls.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index cd4e167..1c7acff 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -19,7 +19,7 @@ #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/accessibility/accessible_view_state.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/keycodes/keyboard_codes.h" @@ -295,7 +295,7 @@ gfx::Size BookmarkBubbleView::GetMinimumSize() { return size; } -void BookmarkBubbleView::GetAccessibleState(ui::AccessibleViewState* state) { +void BookmarkBubbleView::GetAccessibleState(ui::AXViewState* state) { BubbleDelegateView::GetAccessibleState(state); state->name = l10n_util::GetStringUTF16( diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index a01c608..d80f763 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -77,7 +77,7 @@ class BookmarkBubbleView : public views::BubbleDelegateView, // Overridden from views::View: virtual gfx::Size GetMinimumSize() OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // Overridden from views::ButtonListener: // Closes the bubble or opens the edit dialog. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index a733d51..ecac9bf 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -23,7 +23,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "ui/base/accessibility/accessible_view_state.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/events/event.h" #include "ui/views/background.h" @@ -164,10 +164,10 @@ bool BookmarkEditorView::HandleKeyEvent(views::Textfield* sender, return false; } -void BookmarkEditorView::GetAccessibleState(ui::AccessibleViewState* state) { +void BookmarkEditorView::GetAccessibleState(ui::AXViewState* state) { state->name = l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_TITLE); - state->role = ui::AccessibilityTypes::ROLE_DIALOG; + state->role = ui::AX_ROLE_DIALOG; } void BookmarkEditorView::ButtonPressed(views::Button* sender, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index 3bdf354..b62fa49 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -89,7 +89,7 @@ class BookmarkEditorView : public BookmarkEditor, // views::View: virtual gfx::Size GetPreferredSize() OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // views::TreeViewController: virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view) OVERRIDE; |