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

chrome/browser/ui/views/frame/browser_view_layout.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_layout.h"
 
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 204 matching lines @@
   switch (view->GetID()) {
     case VIEW_ID_CONTENTS_SPLIT: {
       contents_split_ = static_cast<views::SingleSplitView*>(view);
       // We're installed as the LayoutManager before BrowserView creates the
       // contents, so we have to set contents_container_ here rather than in
       // Installed.
       contents_container_ = browser_view_->contents_;
       break;
     }
     case VIEW_ID_INFO_BAR_CONTAINER:
-      infobar_container_ = view;
+      infobar_container_ = static_cast<InfoBarContainer*>(view);
       break;
     case VIEW_ID_DOWNLOAD_SHELF:
       download_shelf_ = static_cast<DownloadShelfView*>(view);
       break;
     case VIEW_ID_BOOKMARK_BAR:
       active_bookmark_bar_ = static_cast<BookmarkBarView*>(view);
       break;
     case VIEW_ID_TOOLBAR:
       toolbar_ = static_cast<ToolbarView*>(view);
       break;
@@ skipping 119 matching lines @@
   int bookmark_bar_height = active_bookmark_bar_->GetPreferredSize().height();
   y -= kSeparationLineHeight + active_bookmark_bar_->GetToolbarOverlap(false);
   active_bookmark_bar_->SetVisible(true);
   active_bookmark_bar_->SetBounds(vertical_layout_rect_.x(), y,
                                   vertical_layout_rect_.width(),
                                   bookmark_bar_height);
   return y + bookmark_bar_height;
 }
 
 int BrowserViewLayout::LayoutInfoBar(int top) {
+  // Raise the |infobar_container_| by its overlapping tab_height.
   bool visible = InfobarVisible();
-  int height = visible ? infobar_container_->GetPreferredSize().height() : 0;
+  InfoBarContainer::Heights heights = visible ?
+      infobar_container_->GetHeights() : InfoBarContainer::Heights(0, 0);
   infobar_container_->SetVisible(visible);
-  infobar_container_->SetBounds(vertical_layout_rect_.x(), top,
-                                vertical_layout_rect_.width(), height);
-  return top + height;
+  infobar_container_->SetBounds(vertical_layout_rect_.x(),
+                                top - heights.tab_height(),
+                                vertical_layout_rect_.width(),
+                                heights.height());
+  return top + heights.bar_height();
 }
 
 // |browser_reserved_rect| is in browser_view_ coordinates.
 // |future_source_bounds| is in |source|'s parent coordinates.
 // |future_parent_offset| is required, since parent view is not moved yet.
 // Note that |future_parent_offset| is relative to browser_view_, not to
 // the parent view.
 void BrowserViewLayout::UpdateReservedContentsRect(
     const gfx::Rect& browser_reserved_rect,
     TabContentsContainer* source,
@@ skipping 132 matching lines @@
                                vertical_layout_rect_.width(), height);
     download_shelf_->Layout();
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
-      (infobar_container_->GetPreferredSize().height() != 0);
+      (infobar_container_->GetHeights().height() != 0);
 }