Removes phantom tabs.

chrome/browser/views/tabs/tab_strip.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/tab_strip.h"
 
 #include "app/animation_container.h"
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 51 matching lines @@
 // until the user can actually see the tab.
 static const int kNetTabSelectedOffset = -13;
 
 static const int kNewTabButtonHOffset = -5;
 static const int kNewTabButtonVOffset = 5;
 static const int kResizeTabsTimeMs = 300;
 static const int kSuspendAnimationsTimeMs = 200;
 static const int kTabHOffset = -16;
 static const int kTabStripAnimationVSlop = 40;
 
-// Alpha value phantom tabs are rendered at.
-static const int kPhantomTabAlpha = 105;
-
-// Alpha value phantom tab icons are rendered at.
-static const int kPhantomTabIconAlpha = 160;
-
 // Size of the drop indicator.
 static int drop_indicator_width;
 static int drop_indicator_height;
 
 static inline int Round(double x) {
   // Why oh why is this not in a standard header?
   return static_cast<int>(floor(x + 0.5));
 }
 
 namespace {
@@ skipping 235 matching lines @@
   // do this as during dragging there isn't a theme provider.
   tab->set_theme_provider(GetThemeProvider());
   return tab;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, views::View overrides:
 
 void TabStrip::PaintChildren(gfx::Canvas* canvas) {
   // Tabs are painted in reverse order, so they stack to the left.
-  // Phantom tabs appear behind all other tabs and are rendered first. To make
-  // them slightly transparent we render them to a different layer.
-  if (HasPhantomTabs()) {
-    SkRect bounds;
-    bounds.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
-    canvas->saveLayerAlpha(&bounds, kPhantomTabAlpha,
-                           SkCanvas::kARGB_ClipLayer_SaveFlag);
-    canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
-    for (int i = tab_count() - 1; i >= 0; --i) {
-      Tab* tab = GetTabAtTabDataIndex(i);
-      if (tab->data().phantom)
-        tab->ProcessPaint(canvas);
-    }
-    canvas->restore();
-
-    canvas->saveLayerAlpha(&bounds, kPhantomTabIconAlpha,
-                           SkCanvas::kARGB_ClipLayer_SaveFlag);
-    canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
-    for (int i = tab_count() - 1; i >= 0; --i) {
-      Tab* tab = GetTabAtTabDataIndex(i);
-      if (tab->data().phantom) {
-        canvas->save();
-        canvas->ClipRectInt(tab->MirroredX(), tab->y(), tab->width(),
-                            tab->height());
-        canvas->TranslateInt(tab->MirroredX(), tab->y());
-        tab->PaintIcon(canvas);
-        canvas->restore();
-      }
-    }
-    canvas->restore();
-  }
-
   Tab* selected_tab = NULL;
 
   Tab* dragging_tab = NULL;
 
   int model_count = GetModelCount();
 
   for (int i = tab_count() - 1; i >= 0; --i) {
     Tab* tab = GetTabAtTabDataIndex(i);
     // We must ask the _Tab's_ model, not ourselves, because in some situations
     // the model will be different to this object, e.g. when a Tab is being
     // removed after its TabContents has been destroyed.
-    if (!tab->data().phantom) {
-      if (tab->dragging()) {
-        dragging_tab = tab;
-      } else if (!tab->IsSelected()) {
-        if (tab->render_unselected() && model_count > 1) {
-          // See comment above kNetTabAnimationSelectedOffset as to why we do
-          // this.
-          Tab* last_tab = GetTabAtModelIndex(model_count - 2);
-          canvas->save();
-          int clip_x = last_tab->bounds().right() + kNetTabSelectedOffset;
-          int clip_width = width() - clip_x;
-          clip_x = MirroredXWithWidthInsideView(clip_x, clip_width);
-          canvas->ClipRectInt(clip_x, 0, clip_width, height());
-          tab->ProcessPaint(canvas);
-          canvas->restore();
-        } else {
-          tab->ProcessPaint(canvas);
-        }
+    if (tab->dragging()) {
+      dragging_tab = tab;
+    } else if (!tab->IsSelected()) {
+      if (tab->render_unselected() && model_count > 1) {
+        // See comment above kNetTabAnimationSelectedOffset as to why we do
+        // this.
+        Tab* last_tab = GetTabAtModelIndex(model_count - 2);
+        canvas->save();
+        int clip_x = last_tab->bounds().right() + kNetTabSelectedOffset;
+        int clip_width = width() - clip_x;
+        clip_x = MirroredXWithWidthInsideView(clip_x, clip_width);
+        canvas->ClipRectInt(clip_x, 0, clip_width, height());
+        tab->ProcessPaint(canvas);
+        canvas->restore();
       } else {
-        selected_tab = tab;
+        tab->ProcessPaint(canvas);
       }
+    } else {
+      selected_tab = tab;
     }
   }
 
   if (GetWindow()->GetNonClientView()->UseNativeFrame()) {
     // Make sure unselected tabs are somewhat transparent.
     SkPaint paint;
     paint.setColor(SkColorSetARGB(200, 255, 255, 255));
     paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
     paint.setStyle(SkPaint::kFill_Style);
     canvas->FillRectInt(
@@ skipping 949 matching lines @@
               &TabStrip::ResizeLayoutTabs),
           kResizeTabsTimeMs);
     }
   } else {
     // Mouse moved quickly out of the tab strip and then into it again, so
     // cancel the timer so that the strip doesn't move when the mouse moves
     // back over it.
     resize_layout_factory_.RevokeAll();
   }
 }
-
-bool TabStrip::HasPhantomTabs() const {
-  for (int i = 0; i < tab_count(); ++i) {
-    if (GetTabAtTabDataIndex(i)->data().phantom)
-      return true;
-  }
-  return false;
-}