alternate ntp: unpinned bookmark bar in ntp

ui/views/controls/single_split_view.cc

 // Copyright (c) 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 "ui/views/controls/single_split_view.h"
 
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ skipping 12 matching lines @@
 // Size of the divider in pixels.
 static const int kDividerSize = 4;
 
 SingleSplitView::SingleSplitView(View* leading,
                                  View* trailing,
                                  Orientation orientation,
                                  SingleSplitViewListener* listener)
     : is_horizontal_(orientation == HORIZONTAL_SPLIT),
       divider_offset_(-1),
       resize_leading_on_bounds_change_(true),
-      listener_(listener),
-      leading_bottom_offset_(0) {
+      listener_(listener) {
   AddChildView(leading);
   AddChildView(trailing);
 #if defined(OS_WIN)
   set_background(
       views::Background::CreateSolidBackground(
           skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
 #endif
 }
 
 void SingleSplitView::Layout() {
@@ skipping 87 matching lines @@
   int divider_size =
       !is_leading_visible || !is_trailing_visible ? 0 : kDividerSize;
 
   if (is_horizontal_) {
     *leading_bounds = gfx::Rect(0, 0, divider_at, bounds.height());
     *trailing_bounds =
         gfx::Rect(divider_at + divider_size, 0,
                   std::max(0, bounds.width() - divider_at - divider_size),
                   bounds.height());
   } else {
-    *leading_bounds = gfx::Rect(
-        0, 0, bounds.width(), divider_at - leading_bottom_offset_);
+    *leading_bounds = gfx::Rect(0, 0, bounds.width(), divider_at);
     *trailing_bounds =
         gfx::Rect(0, divider_at + divider_size, bounds.width(),
                   std::max(0, bounds.height() - divider_at - divider_size));
   }
 }
 
 void SingleSplitView::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
 }
 
-void SingleSplitView::SetLeadingBottomOffset(int offset) {
-  if (leading_bottom_offset_ == offset)
-    return;
-  leading_bottom_offset_ = offset;
-  InvalidateLayout();
-}
-
 bool SingleSplitView::OnMousePressed(const ui::MouseEvent& event) {
   if (!IsPointInDivider(event.location()))
     return false;
   drag_info_.initial_mouse_offset = GetPrimaryAxisSize(event.x(), event.y());
   drag_info_.initial_divider_offset =
       NormalizeDividerOffset(divider_offset_, bounds());
   return true;
 }
 
 bool SingleSplitView::OnMouseDragged(const ui::MouseEvent& event) {
   if (child_count() < 2)
     return false;
 
   int delta_offset = GetPrimaryAxisSize(event.x(), event.y()) -
       drag_info_.initial_mouse_offset;
   if (is_horizontal_ && base::i18n::IsRTL())
     delta_offset *= -1;
   // Honor the minimum size when resizing.
   gfx::Size min = child_at(0)->GetMinimumSize();
-  int new_size = std::max(GetPrimaryAxisSize(min.width(),
-                          min.height() + leading_bottom_offset_),
+  int new_size = std::max(GetPrimaryAxisSize(min.width(), min.height()),
                           drag_info_.initial_divider_offset + delta_offset);
 
   // And don't let the view get bigger than our width.
   new_size = std::min(GetPrimaryAxisSize() - kDividerSize, new_size);
 
   if (new_size != divider_offset_) {
     set_divider_offset(new_size);
     if (!listener_ || listener_->SplitHandleMoved(this))
       Layout();
   }
@@ skipping 21 matching lines @@
     return false;
 
   if (!child_at(0)->visible() || !child_at(1)->visible())
     return false;
 
   int divider_relative_offset;
   if (is_horizontal_) {
     divider_relative_offset =
         p.x() - child_at(base::i18n::IsRTL() ? 1 : 0)->width();
   } else {
-    divider_relative_offset =
-        p.y() - (child_at(0)->height() + leading_bottom_offset_);
+    divider_relative_offset = p.y() - child_at(0)->height();
   }
   return (divider_relative_offset >= 0 &&
       divider_relative_offset < kDividerSize);
 }
 
 int SingleSplitView::CalculateDividerOffset(
     int divider_offset,
     const gfx::Rect& previous_bounds,
     const gfx::Rect& new_bounds) const {
   if (resize_leading_on_bounds_change_ && divider_offset != -1) {
@@ skipping 19 matching lines @@
                                             const gfx::Rect& bounds) const {
   int primary_axis_size = GetPrimaryAxisSize(bounds.width(), bounds.height());
   if (divider_offset < 0)
     // primary_axis_size may < kDividerSize during initial layout.
     return std::max(0, (primary_axis_size - kDividerSize) / 2);
   return std::min(divider_offset,
                   std::max(primary_axis_size - kDividerSize, 0));
 }
 
 }  // namespace views