Small tweaks to improve toolbar keyboard accessibility: Put focus rects...

chrome/browser/views/toolbar_view.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
@@ skipping 69 matching lines @@
   // Accessors...
   Browser* browser() const { return browser_; }
   BrowserActionsContainer* browser_actions() const { return browser_actions_; }
   ReloadButton* reload_button() const { return reload_; }
   LocationBarView* location_bar() const { return location_bar_; }
   views::MenuButton* page_menu() const { return page_menu_; }
   views::MenuButton* app_menu() const { return app_menu_; }
   bool collapsed() const { return collapsed_; }
   void SetCollapsed(bool val);
 
+  // Overridden from AccessibleToolbarView
+  virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus);
+
   // Overridden from Menu::BaseControllerDelegate:
   virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel);
 
   // Overridden from views::MenuDelegate:
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Overridden from LocationBarView::Delegate:
   virtual TabContents* GetTabContents();
   virtual void OnInputInProgress(bool in_progress);
 
@@ skipping 18 matching lines @@
                                           menus::Accelerator* accelerator);
   virtual void ExecuteCommand(int command_id);
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
   virtual void ThemeChanged();
 
  protected:
-  // Override this so that when the user presses F6 to rotate toolbar panes,
-  // the location bar gets focus, not the first control in the toolbar.
+
+  // Overridden from AccessibleToolbarView
   virtual views::View* GetDefaultFocusableChild();
+  virtual void RemoveToolbarFocus();
 
  private:
   // Returns the number of pixels above the location bar in non-normal display.
   int PopupTopSpacing() const;
 
   // Loads the images for all the child views.
   void LoadImages();
 
   // Runs various menus.
   void RunPageMenu(const gfx::Point& pt);
@@ skipping 84 matching lines @@
   // running.
   bool* destroyed_flag_;
 
   // When collapsed, the toolbar is just a tiny strip, no controls are visible.
   bool collapsed_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_