Revert 32012-32017

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"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/user_data_manager.h"
-#include "chrome/browser/views/accessible_toolbar_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/pref_member.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/simple_menu_model.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 
 class BackForwardMenuModelViews;
@@ skipping 31 matching lines @@
  public:
   explicit ZoomMenuModel(views::SimpleMenuModel::Delegate* delegate);
   virtual ~ZoomMenuModel() {}
 
  private:
   void Build();
 
   DISALLOW_COPY_AND_ASSIGN(ZoomMenuModel);
 };
 
-// The Browser Window's toolbar.
-class ToolbarView : public AccessibleToolbarView,
+// The Browser Window's toolbar. Used within BrowserView.
+class ToolbarView : public views::View,
                     public views::ViewMenuDelegate,
                     public views::DragController,
                     public views::SimpleMenuModel::Delegate,
                     public LocationBarView::Delegate,
                     public NotificationObserver,
                     public GetProfilesHelper::Delegate,
                     public CommandUpdater::CommandObserver,
                     public views::ButtonListener,
                     public BubblePositioner {
  public:
   explicit ToolbarView(Browser* browser);
   virtual ~ToolbarView();
 
   // Create the contents of the Browser Toolbar
   void Init(Profile* profile);
 
   // Sets the profile which is active on the currently-active tab.
   void SetProfile(Profile* profile);
   Profile* profile() { return profile_; }
 
   // Updates the toolbar (and transitively the location bar) with the states of
   // the specified |tab|.  If |should_restore_state| is true, we're switching
   // (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_; }
   views::MenuButton* page_menu() const { return page_menu_; }
   views::MenuButton* app_menu() const { return app_menu_; }
 
-  // Overridden from AccessibleToolbarView:
-  virtual bool IsAccessibleViewTraversable(views::View* view);
-
   // Overridden from Menu::BaseControllerDelegate:
   virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel);
 
   // Overridden from views::MenuDelegate:
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Overridden from GetProfilesHelper::Delegate:
   virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
 
   // Overridden from LocationBarView::Delegate:
@@ skipping 19 matching lines @@
   virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           views::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();
+  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,
                              OSExchangeData* data);
   virtual int GetDragOperations(View* sender, int x, int y);
 
   // Returns the number of pixels above the location bar in non-normal display.
@@ skipping 28 matching lines @@
   bool IsDisplayModeNormal() const {
     return display_mode_ == DISPLAYMODE_NORMAL;
   }
 
   scoped_ptr<BackForwardMenuModelViews> back_menu_model_;
   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_;
   views::MenuButton* page_menu_;
@@ skipping 21 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_