Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs...

chrome/browser/views/tabs/side_tab.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_TABS_SIDE_TAB_H_
 #define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_
 
 #include "app/gfx/font.h"
 #include "app/slide_animation.h"
 #include "chrome/browser/views/tabs/side_tab_strip_model.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/button/button.h"
 #include "views/view.h"
 
 class SideTab;
 
 class SideTabModel {
  public:
   // Returns metadata about the specified |tab|.
   virtual string16 GetTitle(SideTab* tab) const = 0;
   virtual SkBitmap GetIcon(SideTab* tab) const = 0;
   virtual bool IsSelected(SideTab* tab) const = 0;
 
   // Selects the tab.
   virtual void SelectTab(SideTab* tab) = 0;
 
   // Closes the tab.
   virtual void CloseTab(SideTab* tab) = 0;
-
-  // Shows a context menu for the tab at the specified point in screen coords.
-  virtual void ShowContextMenu(SideTab* tab, const gfx::Point& p) = 0;
 };
 
 class SideTab : public views::View,
-                public views::ContextMenuController,
                 public views::ButtonListener,
                 public AnimationDelegate {
  public:
   explicit SideTab(SideTabModel* model);
   virtual ~SideTab();
 
   // Sets the current network state of the tab. The tab renders different
   // animations in place of the icon when different types of network activity
   // are occurring.
   void SetNetworkState(SideTabStripModel::NetworkState state);
 
   // AnimationDelegate implementation:
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationCanceled(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
 
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
-  // views::ContextMenuController implementation:
-  virtual void ShowContextMenu(views::View* source,
-                               const gfx::Point& p,
-                               bool is_mouse_gesture);
-
   // views::View Overrides:
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
   virtual gfx::Size GetPreferredSize();
   virtual void OnMouseEntered(const views::MouseEvent& event);
   virtual void OnMouseExited(const views::MouseEvent& event);
   virtual bool OnMousePressed(const views::MouseEvent& event);
 
  private:
   void FillTabShapePath(gfx::Path* path);
@@ skipping 24 matching lines @@
   // The current network state for this tab.
   SideTabStripModel::NetworkState current_state_;
 
   // The current index into the Animation image strip.
   int loading_animation_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(SideTab);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_