[linux_views][Win] spoof proof redesign infobar extension with tab.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 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/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1787 matching lines @@
     gfx::Insets insets(GetFindBarBoundingBox().y() + 1,
                        0,
                        0,
                        0);
     aeropeek_manager_->SetContentInsets(insets);
   }
 #endif
 }
 
 void BrowserView::PaintChildren(gfx::Canvas* canvas) {
-  views::ClientView::PaintChildren(canvas);
+  // Paint the |infobar_container_| last so that it may paint its
+  // overlapping tabs.
+  for (int i = 0; i < child_count(); ++i) {
+    View* child = GetChildViewAt(i);
+    DCHECK(child) << "Should not have a NULL child View for index in bounds";

[Peter Kasting, 2011/03/07 20:14:30]

Nit: I would remove this DCHECK().  There are hundreds of places in code we
iterate through View children, and AFAIK none DCHECK the pointers.

[Sheridan Rawlins, 2011/03/08 01:38:19]

Done.

+    if (child != infobar_container_)
+      child->Paint(canvas);
+  }
 
-  infobar_container_->PaintInfoBarArrows(canvas->AsCanvasSkia(),
-                                         this,
-                                         GetInfoBarArrowCenterX());
+  infobar_container_->Paint(canvas);
 }
 
 void BrowserView::ViewHierarchyChanged(bool is_add,
                                        views::View* parent,
                                        views::View* child) {
   if (is_add && child == this && GetWidget() && !initialized_) {
     Init();
     initialized_ = true;
   }
 }
@@ skipping 754 matching lines @@
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }