1 files changed, 13 insertions, 9 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 25d9546..f349e08 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -217,12 +217,12 @@ void ToolbarView::Update(TabContents* tab, bool should_restore_state) {
     browser_actions_->RefreshBrowserActionViews();
 }
 
-void ToolbarView::SetToolbarFocusAndFocusLocationBar(int view_storage_id) {
-  SetToolbarFocus(view_storage_id, location_bar_);
+void ToolbarView::SetPaneFocusAndFocusLocationBar(int view_storage_id) {
+  SetPaneFocus(view_storage_id, location_bar_);
 }
 
-void ToolbarView::SetToolbarFocusAndFocusAppMenu(int view_storage_id) {
-  SetToolbarFocus(view_storage_id, app_menu_);
+void ToolbarView::SetPaneFocusAndFocusAppMenu(int view_storage_id) {
+  SetPaneFocus(view_storage_id, app_menu_);
 }
 
 bool ToolbarView::IsAppMenuFocused() {
@@ -254,17 +254,21 @@ void ToolbarView::RemoveMenuListener(views::MenuListener* listener) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ToolbarView, AccessibleToolbarView overrides:
+// ToolbarView, AccessiblePaneView overrides:
 
-bool ToolbarView::SetToolbarFocus(
+bool ToolbarView::SetPaneFocus(
     int view_storage_id, views::View* initial_focus) {
-  if (!AccessibleToolbarView::SetToolbarFocus(view_storage_id, initial_focus))
+  if (!AccessiblePaneView::SetPaneFocus(view_storage_id, initial_focus))
     return false;
 
   location_bar_->SetShowFocusRect(true);
   return true;
 }
 
+AccessibilityTypes::Role ToolbarView::GetAccessibleRole() {
+  return AccessibilityTypes::ROLE_TOOLBAR;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, Menu::BaseControllerDelegate overrides:
 
@@ -549,8 +553,8 @@ views::View* ToolbarView::GetDefaultFocusableChild() {
   return location_bar_;
 }
 
-void ToolbarView::RemoveToolbarFocus() {
-  AccessibleToolbarView::RemoveToolbarFocus();
+void ToolbarView::RemovePaneFocus() {
+  AccessiblePaneView::RemovePaneFocus();
   location_bar_->SetShowFocusRect(false);
 }