Implement initial version of scroll end effect

chrome/browser/ui/views/frame/browser_view.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/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 396 matching lines @@
       devtools_window_(NULL),
       initialized_(false),
       ignore_layout_(true),
 #if defined(OS_WIN) && !defined(USE_AURA)
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
       force_location_bar_focus_(false),
       immersive_mode_controller_(chrome::CreateImmersiveModeController()),
 #if defined(OS_CHROMEOS)
-      scroll_end_effect_controller_(ScrollEndEffectController::Create()),
+      scroll_end_effect_controller_(ScrollEndEffectController::Create(this)),
 #endif
       color_change_listener_(this),
       activate_modal_dialog_factory_(this) {
 }
 
 BrowserView::~BrowserView() {
   // Immersive mode may need to reparent views before they are removed/deleted.
   immersive_mode_controller_.reset();
 
   browser_->tab_strip_model()->RemoveObserver(this);
@@ skipping 1413 matching lines @@
   return chrome::ExecuteCommand(browser_.get(), command_id);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, OmniboxPopupModelObserver overrides:
 void BrowserView::OnOmniboxPopupShownOrHidden() {
   infobar_container_->SetMaxTopArrowHeight(GetMaxTopInfoBarArrowHeight());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// BrowserView, ScrollEndEffectControllerDelegate overrides:
+
+ContentsContainer* BrowserView::GetContentsContainer() {
+  return contents_container_;
+}
+
+gfx::Rect BrowserView::GetFrameBounds() {
+  return frame_->GetWindowBoundsInScreen();
+}
+
+void BrowserView::SetFrameBounds(gfx::Rect bounds) {
+  frame_->SetBounds(bounds);
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // BrowserView, ImmersiveModeController::Delegate overrides:
 
 BookmarkBarView* BrowserView::GetBookmarkBar() {
   return bookmark_bar_view_.get();
 }
 
 FullscreenController* BrowserView::GetFullscreenController() {
   // Cannot be injected into ImmersiveModeController because it is constructed
   // after BrowserView.
   return browser()->fullscreen_controller();
@@ skipping 708 matching lines @@
           password_generator,
           browser_.get(),
           GetWidget()->GetThemeProvider());
 
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR);
   bubble->GetWidget()->Show();
 }
 
 void BrowserView::OverscrollUpdate(int delta_y) {
-  if (scroll_end_effect_controller_)
+  // TODO(rharrison): Remove the check for fullscreen & maximized once the
+  // related cases have been fixed in the effect.

[sadrul, 2013/10/25 18:28:25]

Reference the crbug here.

[rharrison, 2013/11/18 21:52:26]

Done.

+  if (scroll_end_effect_controller_ && !IsFullscreen() && !IsMaximized())
     scroll_end_effect_controller_->OverscrollUpdate(delta_y);
 }
 
 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
   if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED ||
       !bookmark_bar_view_.get() || !bookmark_bar_view_->IsDetached()) {
     return 0;
   }
   // Don't use bookmark_bar_view_->height() which won't be the final height if
   // the bookmark bar is animating.
@@ skipping 84 matching lines @@
     // The +1 in the next line creates a 1-px gap between icon and arrow tip.
     gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
         LocationBarView::kIconInternalPadding + 1);
     ConvertPointToTarget(location_icon_view, this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }