Fixes bug in painting multiple selected tabs. Specifically when

chrome/browser/ui/views/tabs/tab_strip.cc

 // Copyright (c) 2012 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/ui/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 1180 matching lines @@
   DoLayout();
 }
 
 void TabStrip::PaintChildren(gfx::Canvas* canvas) {
   // The view order doesn't match the paint order (tabs_ contains the tab
   // ordering). Additionally we need to paint the tabs that are closing in
   // |tabs_closing_map_|.
   Tab* active_tab = NULL;
   std::vector<Tab*> tabs_dragging;
   std::vector<Tab*> selected_tabs;
+  int selected_tab_count = 0;
   bool is_dragging = false;
   int active_tab_index = -1;
   // Since |touch_layout_| is created based on number of tabs and width we use
   // the ideal state to determine if we should paint stacked. This minimizes
   // painting changes as we switch between the two.
   const bool stacking = (layout_type_ == TAB_STRIP_LAYOUT_STACKED) ||
       IsStackingDraggedTabs();
 
   if (kInactiveTabAndNewTabButtonAlpha < 255)
     canvas->SaveLayerAlpha(kInactiveTabAndNewTabButtonAlpha);
 
   PaintClosingTabs(canvas, tab_count());
 
   for (int i = tab_count() - 1; i >= 0; --i) {
     Tab* tab = tab_at(i);
+    if (tab->IsSelected())
+      selected_tab_count++;
     if (tab->dragging() && !stacking) {
       is_dragging = true;
       if (tab->IsActive()) {
         active_tab = tab;
         active_tab_index = i;
       } else {
         tabs_dragging.push_back(tab);
       }
     } else if (!tab->IsActive()) {
       if (!tab->IsSelected()) {
@@ skipping 18 matching lines @@
 
     for (int i = tab_count() - 1; i > active_tab_index; --i) {
       Tab* tab = tab_at(i);
       tab->Paint(canvas);
     }
   }
   if (kInactiveTabAndNewTabButtonAlpha < 255)
     canvas->Restore();
 
   if (GetWidget()->ShouldUseNativeFrame()) {
-    bool multiple_tabs_selected = (!selected_tabs.empty() ||
-                                   tabs_dragging.size() > 1);
     // Make sure non-active tabs are somewhat transparent.
     SkPaint paint;
     // If there are multiple tabs selected, fade non-selected tabs more to make
     // the selected tabs more noticable.
-    int alpha = multiple_tabs_selected ?
+    int alpha = selected_tab_count > 1 ?
         kNativeFrameInactiveTabAlphaMultiSelection :
         kNativeFrameInactiveTabAlpha;
     paint.setColor(SkColorSetARGB(alpha, 255, 255, 255));
     paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
     paint.setStyle(SkPaint::kFill_Style);
     // The tabstrip area overlaps the toolbar area by 2 px.
     canvas->DrawRect(gfx::Rect(0, 0, width(), height() - 2), paint);
   }
 
   // Now selected but not active. We don't want these dimmed if using native
@@ skipping 1299 matching lines @@
   if (!adjust_layout_)
     return false;
 
 #if !defined(OS_CHROMEOS)
   if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
     return false;
 #endif
 
   return true;
 }