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

chrome/browser/views/tabs/side_tab.cc

 // 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.
 
 #include "chrome/browser/views/tabs/side_tab.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/utf_string_conversions.h"
@@ skipping 38 matching lines @@
 
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL, close_button_n_);
   close_button->SetImage(views::CustomButton::BS_HOT, close_button_h_);
   close_button->SetImage(views::CustomButton::BS_PUSHED, close_button_p_);
   close_button_ = close_button;
   AddChildView(close_button_);
 
   hover_animation_.reset(new SlideAnimation(this));
   hover_animation_->SetSlideDuration(kHoverDurationMs);
-
-  SetContextMenuController(this);
 }
 
 SideTab::~SideTab() {
 }
 
 void SideTab::SetNetworkState(SideTabStripModel::NetworkState state) {
   if (current_state_ != state) {
     // The waiting animation is the reverse of the loading animation, but at a
     // different rate - the following reverses and scales the animation_frame_
     // so that the frame is at an equivalent position when going from one
@@ skipping 34 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // SideTab, views::ButtonListener implementation:
 
 void SideTab::ButtonPressed(views::Button* sender, const views::Event& event) {
   DCHECK(sender == close_button_);
   model_->CloseTab(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// SideTab, views::ContextMenuController implementation:
-
-void SideTab::ShowContextMenu(views::View* source,
-                              const gfx::Point& p,
-                              bool is_mouse_gesture) {
-  model_->ShowContextMenu(this, p);
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // SideTab, views::View overrides:
 
 void SideTab::Layout() {
   int icon_y;
   int icon_x = icon_y = (height() - kIconSize) / 2;
   icon_bounds_.SetRect(icon_x, icon_y, kIconSize, kIconSize);
 
   gfx::Size ps = close_button_->GetPreferredSize();
   int close_y = (height() - ps.height()) / 2;
-  close_button_->SetBounds(
-      std::max(0, width() - ps.width() - close_y),
-      close_y,
-      ps.width(),
-      ps.height());
+  close_button_->SetBounds(width() - ps.width() - close_y, close_y, ps.width(),
+                           ps.height());
 
   int title_y = (height() - font_->height()) / 2;
   int title_x = icon_bounds_.right() + kIconTitleSpacing;
-  title_bounds_.SetRect(
-      title_x,
-      title_y,
-      std::max(0, close_button_->x() - kTitleCloseSpacing - title_x),
-      font_->height());
+  title_bounds_.SetRect(title_x, title_y,
+                        close_button_->x() - kTitleCloseSpacing - title_x,
+                        font_->height());
 }
 
 void SideTab::Paint(gfx::Canvas* canvas) {
   SkPaint paint;
   paint.setColor(kTabBackgroundColor);
   paint.setAntiAlias(true);
   gfx::Path tab_shape;
   FillTabShapePath(&tab_shape);
   canvas->drawPath(tab_shape, paint);
 
@@ skipping 110 matching lines @@
     waiting_animation_frame_count =
         waiting_animation_frames->width() / waiting_animation_frames->height();
 
     waiting_to_loading_frame_count_ratio =
         waiting_animation_frame_count / loading_animation_frame_count;
 
     initialized = true;
   }
 }