Allow ESC to cancel ALT+SHIFT+T in Toolbar

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2009 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 "chrome/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 32 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "views/background.h"
 #include "views/controls/button/button_dropdown.h"
 #include "views/controls/label.h"
 #include "views/drag_utils.h"
+#include "views/focus/view_storage.h"
+#include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
 static const int kControlHorizOffset = 4;
 static const int kControlVertOffset = 6;
 static const int kControlIndent = 3;
 static const int kStatusBubbleWidth = 480;
 
 // Separation between the location bar and the menus.
@@ skipping 81 matching lines @@
   AddItemWithStringId(IDC_ZOOM_NORMAL, IDS_ZOOM_NORMAL);
   AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       acc_focused_view_(NULL),
+      last_focused_view_storage_id_(
+          views::ViewStorage::GetSharedInstance()->CreateStorageID()),
       back_(NULL),
       forward_(NULL),
       reload_(NULL),
       home_(NULL),
       star_(NULL),
       location_bar_(NULL),
       go_(NULL),
       browser_actions_(NULL),
       page_menu_(NULL),
       app_menu_(NULL),
@@ skipping 72 matching lines @@
     }
     // Update view_index with the available button index found.
     view_index = current_view_index;
     break;
   }
   // Returns the next available button index, or if no button is available in
   // the specified direction, remains where it was.
   return view_index;
 }
 
+void ToolbarView::InitializeTraversal() {
+  // If MSAA focus exists, we don't need to traverse, since its already active.
+  if (acc_focused_view_ != NULL)
+    return;
+
+  // Save the last focused view so that when the user presses ESC, it will
+  // return back to the last focus.
+  views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
+  view_storage->StoreView(last_focused_view_storage_id_,
+                          GetRootView()->GetFocusedView());
+
+  // HACK: Do not use RequestFocus() here, as the toolbar is not marked as
+  // "focusable".  Instead bypass the sanity check in RequestFocus() and just
+  // force it to focus, which will do the right thing.
+  GetRootView()->FocusView(this);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, Menu::BaseControllerDelegate overrides:
 
 bool ToolbarView::GetAcceleratorInfo(int id, views::Accelerator* accel) {
   return GetWidget()->GetAccelerator(id, accel);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::MenuDelegate implementation:
 
@@ skipping 395 matching lines @@
   // TODO(port): deal with toolbar a11y focus.
   NOTIMPLEMENTED();
 #endif
 }
 
 void ToolbarView::WillLoseFocus() {
   // Any tooltips that are active should be hidden when toolbar loses focus.
   if (GetWidget() && GetWidget()->GetTooltipManager())
     GetWidget()->GetTooltipManager()->HideKeyboardTooltip();
 
-  // Removes the Child MSAA view's focus when toolbar loses focus.
+  // Removes the Child MSAA view's focus and the view from the ViewStorage,
+  // when toolbar loses focus.
   if (acc_focused_view_) {
     acc_focused_view_->SetHotTracked(false);
     acc_focused_view_ = NULL;
+    views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
+    view_storage->RemoveView(last_focused_view_storage_id_);
   }
 }
 
 void ToolbarView::RequestFocus() {
   // When the toolbar needs to request focus, the default implementation of
   // View::RequestFocus requires the View to be focusable. Since ToolbarView is
   // not technically focused, we need to temporarily set and remove focus so
-  // that it can focus back to its MSAA focused state.
-  if (acc_focused_view_) {
-    SetFocusable(true);
-    View::RequestFocus();
-    SetFocusable(false);
-  } else {
-    View::RequestFocus();
-  }
+  // that it can focus back to its MSAA focused state. |acc_focused_view_| is
+  // not necessarily set since it can be null if this view has already lost
+  // focus, such as traversing through the context menu.
+  SetFocusable(true);
+  View::RequestFocus();
+  SetFocusable(false);
 }
 
 bool ToolbarView::OnKeyPressed(const views::KeyEvent& e) {
   // Paranoia check, button should be initialized upon toolbar gaining focus.
   if (!acc_focused_view_)
     return false;
 
   int focused_view = GetChildIndex(acc_focused_view_);
   int next_view = focused_view;
 
@@ skipping 65 matching lines @@
 
 bool ToolbarView::OnKeyReleased(const views::KeyEvent& e) {
   // Paranoia check, button should be initialized upon toolbar gaining focus.
   if (!acc_focused_view_)
     return false;
 
   // Have keys be handled by the views themselves.
   return acc_focused_view_->OnKeyReleased(e);
 }
 
+bool ToolbarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
+  if (acc_focused_view_ && e.GetKeyCode() == base::VKEY_ESCAPE) {
+    // Retrieve the focused view from the storage so we can request focus back
+    // to it. If |focus_view| is null, we place focus on the location bar.
+    // |acc_focused_view_| doesn't need to be resetted here since it will be
+    // dealt within the WillLoseFocus method.
+    views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
+    views::View* focused_view =
+        view_storage->RetrieveView(last_focused_view_storage_id_);
+    if (focused_view) {
+      view_storage->RemoveView(last_focused_view_storage_id_);
+      focused_view->RequestFocus();
+    } else {
+      location_bar_->RequestFocus();
+    }
+    return true;
+  }
+  return false;
+}
+
 bool ToolbarView::GetAccessibleName(std::wstring* name) {
   if (!accessible_name_.empty()) {
     (*name).assign(accessible_name_);
     return true;
   }
   return false;
 }
 
 bool ToolbarView::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
@@ skipping 381 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }