Beginnings of a new InfoBar system.

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/encoding_menu_controller_delegate.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/about_chrome_view.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/bookmark_manager_view.h"
 #include "chrome/browser/views/bug_report_view.h"
 #include "chrome/browser/views/clear_browsing_data.h"
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/html_dialog_view.h"
 #include "chrome/browser/views/importer_view.h"
+#include "chrome/browser/views/infobars/infobar_container.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/status_bubble.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/browser/web_contents.h"
 #include "chrome/browser/web_contents_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/drag_drop_types.h"
@@ skipping 293 matching lines @@
   tabstrip_ = new TabStrip(browser_->tabstrip_model());
   tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP));
   AddChildView(tabstrip_);
 
   toolbar_ = new BrowserToolbarView(browser_->controller(), browser_.get());
   AddChildView(toolbar_);
   toolbar_->SetID(VIEW_ID_TOOLBAR);
   toolbar_->Init(browser_->profile());
   toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR));
 
+  infobar_container_ = new InfoBarContainer(this);
+  AddChildView(infobar_container_);
+
   contents_container_ = new TabContentsContainerView;
   set_contents_view(contents_container_);
   AddChildView(contents_container_);
 
   status_bubble_.reset(new StatusBubble(GetContainer()));
 
 #ifdef CHROME_PERSONALIZATION
   EnablePersonalization(CommandLine().HasSwitch(switches::kEnableP13n));
   if (IsPersonalizationEnabled()) {
     personalization_ = Personalization::CreateFramePersonalization(
@@ skipping 287 matching lines @@
 
 void BrowserView::TabSelectedAt(TabContents* old_contents,
                                 TabContents* new_contents,
                                 int index,
                                 bool user_gesture) {
   DCHECK(old_contents != new_contents);
 
   if (old_contents)
     old_contents->StoreFocus();
 
-  // Tell the frame what happened so that the TabContents gets resized, etc.
+  // Update various elements that are interested in knowing the current
+  // TabContents.
+  infobar_container_->ChangeTabContents(new_contents);
   contents_container_->SetTabContents(new_contents);
   // TODO(beng): This should be called automatically by SetTabContents, but I
   //             am striving for parity now rather than cleanliness. This is
   //             required to make features like Duplicate Tab, Undo Close Tab,
   //             etc not result in sad tab.
   new_contents->DidBecomeSelected();
   if (BrowserList::GetLastActive() == browser_)
     new_contents->RestoreFocus();
 
   // Update all the UI bits.
@@ skipping 389 matching lines @@
   toolbar_->SetVisible(false);
   return top;
 }
 
 int BrowserView::LayoutBookmarkAndInfoBars(int top) {
   if (SupportsWindowFeature(FEATURE_BOOKMARKBAR)) {
     // If we have an Info-bar showing, and we're showing the New Tab Page, and
     // the Bookmark bar isn't visible on all tabs, then we need to show the
     // Info bar _above_ the Bookmark bar, since the Bookmark bar is styled to
     // look like it's part of the New Tab Page...
-    if (active_info_bar_ && active_bookmark_bar_ &&
+    if (active_bookmark_bar_ &&
         bookmark_bar_view_->IsNewTabPage() &&
         !bookmark_bar_view_->IsAlwaysShown()) {
       top = LayoutInfoBar(top);
       return LayoutBookmarkBar(top);
     }
     // Otherwise, Bookmark bar first, Info bar second.
     top = LayoutBookmarkBar(top);
   }
   return LayoutInfoBar(top);
 }
 
 int BrowserView::LayoutBookmarkBar(int top) {
   if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) && active_bookmark_bar_) {
     gfx::Size ps = active_bookmark_bar_->GetPreferredSize();
     if (!active_info_bar_ || show_bookmark_bar_pref_.GetValue())
       top -= kSeparationLineHeight;
     active_bookmark_bar_->SetBounds(0, top, width(), ps.height());
     top += ps.height();
   }
   return top;
 }
 int BrowserView::LayoutInfoBar(int top) {
-  if (SupportsWindowFeature(FEATURE_INFOBAR) && active_info_bar_) {
-    gfx::Size ps = active_info_bar_->GetPreferredSize();
-    active_info_bar_->SetBounds(0, top, width(), ps.height());
+  if (SupportsWindowFeature(FEATURE_INFOBAR)) {
+    // Layout the new infobar.
+    gfx::Size ps = infobar_container_->GetPreferredSize();
+    infobar_container_->SetBounds(0, top, width(), ps.height());
     top += ps.height();
-    if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) && active_bookmark_bar_ &&
-        !show_bookmark_bar_pref_.GetValue()) {
-      top -= kSeparationLineHeight;
+
+    if (active_info_bar_) {
+      // Layout the old infobar.
+      ps = active_info_bar_->GetPreferredSize();
+      active_info_bar_->SetBounds(0, top, width(), ps.height());
+      top += ps.height();
+      if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) && active_bookmark_bar_ &&
+          !show_bookmark_bar_pref_.GetValue()) {
+        top -= kSeparationLineHeight;
+      }
     }
   }
   return top;
 }
 
 void BrowserView::LayoutTabContents(int top, int bottom) {
   contents_container_->SetBounds(0, top, width(), bottom - top);
 }
 
 int BrowserView::LayoutDownloadShelf() {
@@ skipping 26 matching lines @@
   }
   return UpdateChildViewAndLayout(new_bookmark_bar_view,
                                   &active_bookmark_bar_);
 }
 
 bool BrowserView::MaybeShowInfoBar(TabContents* contents) {
   views::View* new_info_bar = NULL;
   if (contents && contents->AsWebContents() &&
       contents->AsWebContents()->view()->IsInfoBarVisible())
     new_info_bar = contents->AsWebContents()->view()->GetInfoBarView();
-  return UpdateChildViewAndLayout(new_info_bar, &active_info_bar_);
+  UpdateChildViewAndLayout(new_info_bar, &active_info_bar_);
+
+  // TODO(beng): remove this function once the InfoBar rejiggering is complete.
+  return true;
 }
 
 bool BrowserView::MaybeShowDownloadShelf(TabContents* contents) {
   views::View* new_shelf = NULL;
   if (contents && contents->IsDownloadShelfVisible())
     new_shelf = contents->GetDownloadShelfView();
   return UpdateChildViewAndLayout(new_shelf, &active_download_shelf_);
 }
 
 void BrowserView::UpdateUIForContents(TabContents* contents) {
@@ skipping 195 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }