Merge 53739 - Cleanup: Remove dead code (was only called when we had app + pa...

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"
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/back_forward_menu_model.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/views/accessible_toolbar_view.h"
 #include "chrome/browser/views/location_bar/location_bar_view.h"
 #include "chrome/browser/views/reload_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/menu_wrapper.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 
 class BrowserActionsContainer;
 class Browser;
 class Profile;
 class WrenchMenu;
 
-namespace views {
-class Menu2;
-}
-
 // The Browser Window's toolbar.
 class ToolbarView : public AccessibleToolbarView,
                     public views::ViewMenuDelegate,
                     public menus::SimpleMenuModel::Delegate,
                     public LocationBarView::Delegate,
                     public AnimationDelegate,
                     public NotificationObserver,
                     public CommandUpdater::CommandObserver,
                     public views::ButtonListener {
  public:
@@ skipping 84 matching lines @@
   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();
 
-  // Check if the menu exited with a code indicating the user wants to
-  // switch to the other menu, and then switch to that other menu.
-  void SwitchToOtherMenuIfNeeded(views::Menu2* previous_menu,
-                                 views::MenuButton* next_menu_button);
-
-  void ActivateMenuButton(views::MenuButton* menu_button);
-
   // Types of display mode this toolbar can have.
   enum DisplayMode {
     DISPLAYMODE_NORMAL,       // Normal toolbar with buttons, etc.
     DISPLAYMODE_LOCATION      // Slimline toolbar showing only compact location
                               // bar, used for popups.
   };
   bool IsDisplayModeNormal() const {
     return display_mode_ == DISPLAYMODE_NORMAL;
   }
 
@@ skipping 60 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_