Experiment with dislodging the Extension Shelf and having it only appear on t...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2009 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/frame/browser_view.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
@@ skipping 637 matching lines @@
   if (is_animating) {
     contents_container_->SetFastResize(true);
     UpdateUIForContents(browser_->GetSelectedTabContents());
     contents_container_->SetFastResize(false);
   } else {
     UpdateUIForContents(browser_->GetSelectedTabContents());
     contents_split_->Layout();
   }
 }
 
+void BrowserView::SelectedTabExtensionShelfSizeChanged() {
+  Layout();
+}
+
 void BrowserView::UpdateTitleBar() {
   frame_->GetWindow()->UpdateWindowTitle();
   if (ShouldShowWindowIcon())
     frame_->GetWindow()->UpdateWindowIcon();
 }
 
 void BrowserView::UpdateDevTools() {
   UpdateDevToolsForContents(GetSelectedTabContents());
   Layout();
 }
@@ skipping 174 matching lines @@
 void BrowserView::ConfirmAddSearchProvider(const TemplateURL* template_url,
                                            Profile* profile) {
   browser::EditSearchEngine(GetWindow()->GetNativeWindow(), template_url, NULL,
                             profile);
 }
 
 void BrowserView::ToggleBookmarkBar() {
   bookmark_utils::ToggleWhenVisible(browser_->profile());
 }
 
+void BrowserView::ToggleExtensionShelf() {
+  ExtensionShelf::ToggleWhenExtensionShelfVisible(browser_->profile());
+}
+
 void BrowserView::ShowAboutChromeDialog() {
   browser::ShowAboutChromeView(GetWidget(), browser_->profile());
 }
 
 void BrowserView::ShowTaskManager() {
   browser::ShowTaskManager();
 }
 
 void BrowserView::ShowBookmarkManager() {
   browser::ShowBookmarkManagerView(browser_->profile());
@@ skipping 529 matching lines @@
   return kBrowserViewClassName;
 }
 
 void BrowserView::Layout() {
   if (ignore_layout_)
     return;
 
   int top = LayoutTabStrip();
   top = LayoutToolbar(top);
   top = LayoutBookmarkAndInfoBars(top);
-  int bottom = LayoutExtensionShelf();
-  bottom = LayoutDownloadShelf(bottom);
+  int bottom = LayoutExtensionAndDownloadShelves();
   LayoutTabContents(top, bottom);
   // This must be done _after_ we lay out the TabContents since this code calls
   // back into us to find the bounding box the find bar must be laid out within,
   // and that code depends on the TabContentsContainer's bounds being up to
   // date.
   FindBarController* find_controller = browser_->find_bar();
   if (find_controller)
     find_controller->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
   // Align status bubble with the bottom of the contents_container_.
   LayoutStatusBubble(top + contents_container_->bounds().height());
@@ skipping 191 matching lines @@
   int height = visible ? infobar_container_->GetPreferredSize().height() : 0;
   infobar_container_->SetVisible(visible);
   infobar_container_->SetBounds(0, top, width(), height);
   return top + height;
 }
 
 void BrowserView::LayoutTabContents(int top, int bottom) {
   contents_split_->SetBounds(0, top, width(), bottom - top);
 }
 
+int BrowserView::LayoutExtensionAndDownloadShelves() {
+  // If we're showing the Bookmark bar in detached style, then we need to show
+  // any Info bar _above_ the Bookmark bar, since the Bookmark bar is styled
+  // to look like it's part of the page.
+  int bottom = height();
+  if (extension_shelf_) {
+    if (extension_shelf_->IsDetachedStyle()) {
+      bottom = LayoutDownloadShelf(bottom);
+      return LayoutExtensionShelf(bottom);
+    }
+    // Otherwise, Extension shelf first, Download shelf second.
+    bottom = LayoutExtensionShelf(bottom);
+  }
+  return LayoutDownloadShelf(bottom);
+}
+
 int BrowserView::LayoutDownloadShelf(int bottom) {
   // Re-layout the shelf either if it is visible or if it's close animation
   // is currently running.
   if (IsDownloadShelfVisible() ||
       (download_shelf_.get() && download_shelf_->IsClosing())) {
     bool visible = browser_->SupportsWindowFeature(
         Browser::FEATURE_DOWNLOADSHELF);
     DCHECK(download_shelf_.get());
     int height = visible ? download_shelf_->GetPreferredSize().height() : 0;
     download_shelf_->SetVisible(visible);
     download_shelf_->SetBounds(0, bottom - height, width(), height);
     download_shelf_->Layout();
     bottom -= height;
   }
   return bottom;
 }
 
 void BrowserView::LayoutStatusBubble(int top) {
   // In restored mode, the client area has a client edge between it and the
   // frame.
   int overlap = StatusBubbleViews::kShadowThickness +
       (IsMaximized() ? 0 : views::NonClientFrameView::kClientEdgeThickness);
   int height = status_bubble_->GetPreferredSize().height();
   gfx::Point origin(-overlap, top - height + overlap);
   ConvertPointToView(this, GetParent(), &origin);
   status_bubble_->SetBounds(origin.x(), origin.y(), width() / 3, height);
 }
 
-int BrowserView::LayoutExtensionShelf() {
-  int bottom = height();
+int BrowserView::LayoutExtensionShelf(int bottom) {
   if (extension_shelf_) {
     bool visible = browser_->SupportsWindowFeature(
         Browser::FEATURE_EXTENSIONSHELF);
     int height =
         visible ? extension_shelf_->GetPreferredSize().height() : 0;
     extension_shelf_->SetVisible(visible);
     extension_shelf_->SetBounds(0, bottom - height, width(), height);
     extension_shelf_->Layout();
     bottom -= height;
   }
@@ skipping 313 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }