Removes phantom tabs.

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/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "gfx/path.h"
 #include "gfx/skia_util.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/image_button.h"
 
 namespace {
 const int kVerticalTabHeight = 27;
 const int kTitleCloseSpacing = 4;
 const SkScalar kRoundRectRadius = 4;
 const SkColor kTabBackgroundColor = SK_ColorWHITE;
 const SkColor kTextColor = SK_ColorBLACK;
-const SkColor kPhantomTextColor = SK_ColorGRAY;
 
 // Padding between the edge and the icon.
 const int kIconLeftPadding = 5;
 
 // Location the title starts at.
 const int kTitleX = kIconLeftPadding + kFavIconSize + 5;
-
-// Alpha value phantom tab icons are rendered at.
-const int kPhantomTabIconAlpha = 100;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SideTab, public:
 
 SideTab::SideTab(TabController* controller)
     : BaseTab(controller, false) {
   SetCloseButtonColor(kTextColor);
 }
 
@@ skipping 44 matching lines @@
   if (ShouldPaintHighlight()) {
     SkPaint paint;
     paint.setColor(kTabBackgroundColor);
     paint.setAntiAlias(true);
     SkRect border_rect = { SkIntToScalar(0), SkIntToScalar(0),
                            SkIntToScalar(width()), SkIntToScalar(height()) };
     canvas->drawRoundRect(border_rect, SkIntToScalar(kRoundRectRadius),
                           SkIntToScalar(kRoundRectRadius), paint);
   }
 
-  if (ShouldShowIcon()) {
-    if (data().phantom) {
-      SkRect bounds;
-      bounds.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
-      canvas->saveLayerAlpha(&bounds, kPhantomTabIconAlpha,
-                             SkCanvas::kARGB_ClipLayer_SaveFlag);
-      PaintIcon(canvas, icon_bounds_.x(), icon_bounds_.y());
-      canvas->restore();
-    } else {
-      PaintIcon(canvas, icon_bounds_.x(), icon_bounds_.y());
-    }
-  }
+  if (ShouldShowIcon())
+    PaintIcon(canvas, icon_bounds_.x(), icon_bounds_.y());
 
-  PaintTitle(canvas, data().phantom ? kPhantomTextColor : kTextColor);
+  PaintTitle(canvas, kTextColor);
 }
 
 gfx::Size SideTab::GetPreferredSize() {
   return gfx::Size(0, GetPreferredHeight());
 }
 
 bool SideTab::ShouldPaintHighlight() const {
   return IsSelected() || !controller();
 }
 
 bool SideTab::ShouldShowIcon() const {
   return data().mini || data().show_icon;
 }