Introduces a new scrollbar for message_center.

ui/views/controls/scroll_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/scroll_view.h"
 
 #include "base/logging.h"
 #include "ui/base/events/event.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
@@ skipping 99 matching lines @@
 
 ScrollView::ScrollView()
     : contents_(NULL),
       contents_viewport_(new Viewport()),
       header_(NULL),
       header_viewport_(new Viewport()),
       horiz_sb_(new NativeScrollBar(true)),
       vert_sb_(new NativeScrollBar(false)),
       resize_corner_(NULL),
       hide_horizontal_scrollbar_(false) {
+  set_notify_enter_exit_on_child(true);
+
   AddChildView(contents_viewport_);
   AddChildView(header_viewport_);
 
   // Don't add the scrollbars as children until we discover we need them
   // (ShowOrHideScrollBar).
   horiz_sb_->SetVisible(false);
   horiz_sb_->set_controller(this);
   vert_sb_->SetVisible(false);
   vert_sb_->set_controller(this);
   if (resize_corner_)
@@ skipping 115 matching lines @@
         std::max(0, viewport_bounds.height() - horiz_sb_height));
     should_layout_contents = true;
   }
   // Default.
   if (!vert_sb_required) {
     viewport_bounds.set_width(viewport_bounds.width() + vert_sb_width);
     should_layout_contents = true;
   }
 
   if (horiz_sb_required) {
+    int horiz_sb_visible_height = horiz_sb_->GetVisibleSize();
+    int height_offset = horiz_sb_visible_height - horiz_sb_height;
     horiz_sb_->SetBounds(0,
-                         viewport_bounds.bottom(),
+                         viewport_bounds.bottom() - height_offset,
                          viewport_bounds.right(),
-                         horiz_sb_height);
+                         horiz_sb_visible_height);
   }
   if (vert_sb_required) {
-    vert_sb_->SetBounds(viewport_bounds.right(),
+    int vert_sb_visible_width = vert_sb_->GetVisibleSize();
+    int width_offset = vert_sb_visible_width - vert_sb_width;
+    vert_sb_->SetBounds(viewport_bounds.right() - width_offset,
                         0,
-                        vert_sb_width,
+                        vert_sb_visible_width,
                         viewport_bounds.bottom());
   }
   if (resize_corner_required) {
     // Show the resize corner.
     resize_corner_->SetBounds(viewport_bounds.right(),
                               viewport_bounds.bottom(),
                               vert_sb_width,
                               horiz_sb_height);
   }
 
@@ skipping 31 matching lines @@
   // Give vertical scrollbar priority
   if (vert_sb_->visible())
     processed = vert_sb_->OnMouseWheel(e);
 
   if (!processed && horiz_sb_->visible())
     processed = horiz_sb_->OnMouseWheel(e);
 
   return processed;
 }
 
+void ScrollView::OnMouseEntered(const ui::MouseEvent& event) {
+  if (horiz_sb_)
+    horiz_sb_->OnMouseEnteredScrollView(event);
+  if (vert_sb_)
+    vert_sb_->OnMouseEnteredScrollView(event);
+}
+
+void ScrollView::OnMouseExited(const ui::MouseEvent& event) {
+  if (horiz_sb_)
+    horiz_sb_->OnMouseExitedScrollView(event);
+  if (vert_sb_)
+    vert_sb_->OnMouseExitedScrollView(event);
+}
+
 void ScrollView::OnGestureEvent(ui::GestureEvent* event) {
   // If the event happened on one of the scrollbars, then those events are
   // sent directly to the scrollbars. Otherwise, only scroll events are sent to
   // the scrollbars.
   bool scroll_event = event->type() == ui::ET_GESTURE_SCROLL_UPDATE ||
                       event->type() == ui::ET_GESTURE_SCROLL_BEGIN ||
                       event->type() == ui::ET_GESTURE_SCROLL_END ||
                       event->type() == ui::ET_SCROLL_FLING_START;
 
   if (vert_sb_->visible()) {
@@ skipping 244 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views