alternate ntp: unpinned bookmark bar in ntp

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

 // Copyright 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/frame/contents_container.h"
 
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 64 matching lines @@
 
 }  // namespace
 
 ContentsContainer::ContentsContainer(views::WebView* active)
     : active_(active),
       preview_(NULL),
       preview_web_contents_(NULL),
       draw_drop_shadow_(false),
       active_top_margin_(0),
       preview_height_(100),
-      preview_height_units_(INSTANT_SIZE_PERCENT),
-      extra_content_height_(0) {
+      preview_height_units_(INSTANT_SIZE_PERCENT) {
   AddChildView(active_);
 }
 
 ContentsContainer::~ContentsContainer() {
   RemoveShadowView(true);
 }
 
 void ContentsContainer::MakePreviewContentsActiveContents() {
   DCHECK(preview_);
 
   active_ = preview_;
   preview_ = NULL;
   preview_web_contents_ = NULL;
   // Since |preview_| has been nuked, shadow view is not needed anymore.
   // Note that the previous |active_| will be deleted by caller (see
   // BrowserView::ActiveTabChanged()) after this call, hence removing the old
   // |active_| as a child, and making the new |active_| (which is the previous
   // |preview_|) the first child.
   RemoveShadowView(true);
   Layout();
 }
 
 void ContentsContainer::SetPreview(views::WebView* preview,
                                    content::WebContents* preview_web_contents,
+                                   const chrome::search::Mode& search_mode,
                                    int height,
                                    InstantSizeUnits units,
                                    bool draw_drop_shadow) {
   // If drawing drop shadow, clip the bottom 1-px-thick separator out of
   // preview.
   // TODO(kuan): remove this when GWS gives chrome the height without the
   // separator.
 #if !defined(OS_WIN)
   if (draw_drop_shadow)
     --height;
 #endif  // !defined(OS_WIN)
 
   if (preview_ == preview && preview_web_contents_ == preview_web_contents &&
-      preview_height_ == height && preview_height_units_ == units &&
-      draw_drop_shadow_ == draw_drop_shadow) {
+      search_mode_ == search_mode && preview_height_ == height &&
+      preview_height_units_ == units && draw_drop_shadow_ == draw_drop_shadow) {
     return;
   }
 
   if (preview_ != preview) {
     if (preview_) {
       // Order of children is important: always |active_| first, then
       // |preview_|, then shadow view if necessary.  To make sure the next view
       // is added in the right order, remove shadow view every time |preview_|
       // is removed.
       RemoveShadowView(false);
       RemoveChildView(preview_);
     }
     preview_ = preview;
     if (preview_)
       AddChildView(preview_);
   }
 
   preview_web_contents_ = preview_web_contents;
+  search_mode_ = search_mode;
   preview_height_ = height;
   preview_height_units_ = units;
   draw_drop_shadow_ = draw_drop_shadow;
 
   // Add or remove shadow view as needed.
   if (preview_ && draw_drop_shadow_) {
 #if !defined(OS_WIN)
     if (!shadow_view_.get())  // Shadow view has not been created.
       shadow_view_.reset(new ShadowView());
     if (!shadow_view_->parent())  // Shadow view has not been added.
@@ skipping 29 matching lines @@
   // haven't changed.
   InvalidateLayout();
 }
 
 gfx::Rect ContentsContainer::GetPreviewBounds() const {
   gfx::Point screen_loc;
   ConvertPointToScreen(this, &screen_loc);
   return gfx::Rect(screen_loc, size());
 }
 
-void ContentsContainer::SetExtraContentHeight(int height) {
-  if (height == extra_content_height_)
-    return;
-  extra_content_height_ = height;
-}
-
 bool ContentsContainer::IsPreviewFullHeight(
     int preview_height,
     InstantSizeUnits preview_height_units) const {
   int height_in_pixels = PreviewHeightInPixels(height(), preview_height,
                                                preview_height_units);
   return height_in_pixels == height();
 }
 
 void ContentsContainer::Layout() {
   int content_y = active_top_margin_;
-  int content_height =
-      std::max(0, height() - content_y + extra_content_height_);
+  int content_height = std::max(0, height() - content_y);
 
   active_->SetBounds(0, content_y, width(), content_height);
 
   if (preview_) {
-    preview_->SetBounds(0, 0, width(),
+    // On NTP, preview starts where content starts vertically, in case there's
+    // a detached bookmark bar.
+    int y = search_mode_.is_ntp() ? content_y : 0;
+    preview_->SetBounds(0, y, width(),
                         PreviewHeightInPixels(height(), preview_height_,
                                               preview_height_units_));
     if (draw_drop_shadow_) {
 #if !defined(OS_WIN)
       DCHECK(shadow_view_.get() && shadow_view_->parent());
       shadow_view_->SetBounds(0, preview_->bounds().height(), width(),
                               shadow_view_->GetPreferredSize().height());
 #endif  // !defined(OS_WIN)
     }
   }
@@ skipping 15 matching lines @@
 
   RemoveChildView(shadow_view_.get());
   if (delete_view)
     shadow_view_.reset(NULL);
   return true;
 }
 
 std::string ContentsContainer::GetClassName() const {
   return kViewClassName;
 }