diff options
Diffstat (limited to 'chrome/browser/ui/views/toolbar')
10 files changed, 22 insertions, 22 deletions
diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.cc b/chrome/browser/ui/views/toolbar/browser_action_view.cc index 780e8c3..7052773 100644 --- a/chrome/browser/ui/views/toolbar/browser_action_view.cc +++ b/chrome/browser/ui/views/toolbar/browser_action_view.cc @@ -22,7 +22,7 @@ #include "extensions/common/manifest_constants.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/event.h" @@ -88,10 +88,10 @@ void BrowserActionView::Layout() { BrowserActionsContainer::IconHeight()); } -void BrowserActionView::GetAccessibleState(ui::AccessibleViewState* state) { +void BrowserActionView::GetAccessibleState(ui::AXViewState* state) { state->name = l10n_util::GetStringUTF16( IDS_ACCNAME_EXTENSIONS_BROWSER_ACTION); - state->role = ui::AccessibilityTypes::ROLE_GROUPING; + state->role = ui::AX_ROLE_GROUP; } gfx::Size BrowserActionView::GetPreferredSize() { @@ -177,9 +177,9 @@ bool BrowserActionButton::CanHandleAccelerators() const { return true; } -void BrowserActionButton::GetAccessibleState(ui::AccessibleViewState* state) { +void BrowserActionButton::GetAccessibleState(ui::AXViewState* state) { views::MenuButton::GetAccessibleState(state); - state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; + state->role = ui::AX_ROLE_BUTTON; } void BrowserActionButton::ButtonPressed(views::Button* sender, diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.h b/chrome/browser/ui/views/toolbar/browser_action_view.h index 7d89919..2138e82 100644 --- a/chrome/browser/ui/views/toolbar/browser_action_view.h +++ b/chrome/browser/ui/views/toolbar/browser_action_view.h @@ -76,7 +76,7 @@ class BrowserActionView : public views::View { // Overridden from views::View: virtual void Layout() OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE; protected: @@ -130,7 +130,7 @@ class BrowserActionButton : public views::MenuButton, // Overridden from views::View: virtual bool CanHandleAccelerators() const OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc index 75ea483..88b7138 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc @@ -29,7 +29,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/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -360,8 +360,8 @@ int BrowserActionsContainer::OnPerformDrop( } void BrowserActionsContainer::GetAccessibleState( - ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_GROUPING; + ui::AXViewState* state) { + state->role = ui::AX_ROLE_GROUP; state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS); } diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h index bb3cff0..e1d425f 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container.h +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h @@ -170,7 +170,7 @@ class BrowserActionsContainer virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; virtual void OnDragExited() OVERRIDE; virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // Overridden from views::MenuButtonListener: virtual void OnMenuButtonClicked(views::View* source, diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc index d9a7b7f..4f248f2 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc @@ -114,7 +114,7 @@ const char* ReloadButton::GetClassName() const { return kViewClassName; } -void ReloadButton::GetAccessibleState(ui::AccessibleViewState* state) { +void ReloadButton::GetAccessibleState(ui::AXViewState* state) { if (menu_enabled_) ToolbarButton::GetAccessibleState(state); else diff --git a/chrome/browser/ui/views/toolbar/reload_button.h b/chrome/browser/ui/views/toolbar/reload_button.h index 057bc6c..f3d1f5d 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.h +++ b/chrome/browser/ui/views/toolbar/reload_button.h @@ -53,7 +53,7 @@ class ReloadButton : public ToolbarButton, virtual bool GetTooltipText(const gfx::Point& p, base::string16* tooltip) const OVERRIDE; virtual const char* GetClassName() const OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; virtual bool ShouldShowMenu() OVERRIDE; virtual void ShowDropDownMenu(ui::MenuSourceType source_type) OVERRIDE; diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc index 2e0e6a4..fb97d1c 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "grit/theme_resources.h" #include "grit/ui_strings.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/models/menu_model.h" #include "ui/gfx/display.h" @@ -121,11 +121,11 @@ void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) { LabelButton::OnGestureEvent(event); } -void ToolbarButton::GetAccessibleState(ui::AccessibleViewState* state) { +void ToolbarButton::GetAccessibleState(ui::AXViewState* state) { CustomButton::GetAccessibleState(state); - state->role = ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN; + state->role = ui::AX_ROLE_BUTTON_DROP_DOWN; state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS); - state->state = ui::AccessibilityTypes::STATE_HASPOPUP; + state->state = ui::AX_STATE_HASPOPUP; } void ToolbarButton::ShowContextMenuForView(View* source, diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h index 6d346c9..acbbc88 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.h +++ b/chrome/browser/ui/views/toolbar/toolbar_button.h @@ -44,7 +44,7 @@ class ToolbarButton : public views::LabelButton, virtual void OnMouseCaptureLost() OVERRIDE; virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // views::ContextMenuController: virtual void ShowContextMenuForView(View* source, diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index 24bac60..34f5162 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -58,7 +58,7 @@ #include "grit/chromium_strings.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/layout.h" #include "ui/base/theme_provider.h" @@ -353,8 +353,8 @@ bool ToolbarView::SetPaneFocus(views::View* initial_focus) { return true; } -void ToolbarView::GetAccessibleState(ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_TOOLBAR; +void ToolbarView::GetAccessibleState(ui::AXViewState* state) { + state->role = ui::AX_ROLE_TOOLBAR; state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLBAR); } diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h index 9f76276..647d97f 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h @@ -98,7 +98,7 @@ class ToolbarView : public views::AccessiblePaneView, // Overridden from AccessiblePaneView virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // Overridden from views::MenuButtonListener: virtual void OnMenuButtonClicked(views::View* source, |