Allow ESC to cancel ALT+SHIFT+T in Toolbar

chrome/browser/views/toolbar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "base/ref_counted.h"
@@ skipping 79 matching lines @@
   // (back?) to this tab and should restore any previous location bar state
   // (such as user editing) as well.
   void Update(TabContents* tab, bool should_restore_state);
 
   // Returns the index of the next view of the toolbar, starting from the given
   // view index (skipping the location bar), in the given navigation direction
   // (nav_left true means navigation right to left, and vice versa). -1 finds
   // first accessible child, based on the above policy.
   int GetNextAccessibleViewIndex(int view_index, bool nav_left);
 
+  // Initialize the MSAA focus traversal on the toolbar.
+  void InitializeTraversal();
+
   void set_acc_focused_view(views::View* acc_focused_view) {
     acc_focused_view_ = acc_focused_view;
   }
 
   // Accessors...
   Browser* browser() const { return browser_; }
   BrowserActionsContainer* browser_actions() const { return browser_actions_; }
   ToolbarStarToggle* star_button() const { return star_; }
   GoButton* go_button() const { return go_; }
   LocationBarView* location_bar() const { return location_bar_; }
@@ skipping 38 matching lines @@
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
   virtual void ThemeChanged();
   virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture);
   virtual void DidGainFocus();
   virtual void WillLoseFocus();
   virtual void RequestFocus();
   virtual bool OnKeyPressed(const views::KeyEvent& e);
   virtual bool OnKeyReleased(const views::KeyEvent& e);
+  virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e);
   virtual bool GetAccessibleName(std::wstring* name);
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual void SetAccessibleName(const std::wstring& name);
   virtual View* GetAccFocusedChildView() { return acc_focused_view_; }
 
  private:
   // Overridden from views::DragController:
   virtual void WriteDragData(View* sender,
                              int press_x,
                              int press_y,
@@ skipping 37 matching lines @@
   scoped_ptr<BackForwardMenuModelViews> forward_menu_model_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
   // Storage of strings needed for accessibility.
   std::wstring accessible_name_;
   // Child view currently having MSAA focus (location bar excluded from arrow
   // navigation).
   views::View* acc_focused_view_;
+  int last_focused_view_storage_id_;
 
   // Controls
   views::ImageButton* back_;
   views::ImageButton* forward_;
   views::ImageButton* reload_;
   views::ImageButton* home_;
   ToolbarStarToggle* star_;
   LocationBarView* location_bar_;
   GoButton* go_;
   BrowserActionsContainer* browser_actions_;
@@ skipping 22 matching lines @@
   scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
   scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_;
   scoped_ptr<views::SimpleMenuModel> app_menu_contents_;
 
   // TODO(beng): build these into MenuButton.
   scoped_ptr<views::Menu2> page_menu_menu_;
   scoped_ptr<views::Menu2> app_menu_menu_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_