Enables restoring of keyboard focus to the the toolbar button that last had f...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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.
 
 #include "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 483 matching lines @@
 BrowserView* BrowserView::GetBrowserView() const {
   return NULL;
 }
 
 void BrowserView::UpdateToolbar(TabContents* contents,
                                 bool should_restore_state) {
   toolbar_->Update(contents, should_restore_state);
 }
 
 void BrowserView::FocusToolbar() {
+  // Do not restore the button that previously had accessibility focus, if
+  // focus is set by using the toolbar focus keyboard shortcut.
+  toolbar_->set_acc_focused_view(NULL);
   toolbar_->RequestFocus();
 }
 
 void BrowserView::DestroyBrowser() {
   // Explicitly delete the BookmarkBarView now. That way we don't have to
   // worry about the BookmarkBarView potentially outliving the Browser &
   // Profile.
   bookmark_bar_view_.reset();
   browser_.reset();
 }
@@ skipping 835 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }