Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 22265009: Implement initial version of scroll end effect Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Major rewrite to handle corner cases and clean up code Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index f191d07e30e85d7d74a43e5874d19b85b4d0e03f..537649c91ecf47479a4bfe180b22ab056540d894 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -415,7 +415,7 @@ BrowserView::BrowserView()
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) {
@@ -1854,6 +1854,44 @@ void BrowserView::OnOmniboxPopupShownOrHidden() {
}
///////////////////////////////////////////////////////////////////////////////
+// BrowserView, ScrollEndEffectControllerDelegate overrides:
+
+ui::Layer* BrowserView::GetBrowserFrameLayer() {
+ if (frame_ == NULL)
+ return NULL;
+ return frame_->GetLayer();
+}
+
+ui::Layer* BrowserView::GetWebContentsLayer() {
+ return GetActiveWebContents()->GetView()->GetNativeView()->layer();
+}
+
+ui::Layer* BrowserView::GetDevToolsLayer() {
+ return devtools_container_->GetWebContents()->GetView()->GetNativeView()->
+ layer();
+}
+
+views::View* BrowserView::GetNonClientView() {
+ if (frame_ == NULL)
+ return NULL;
+ return frame_->GetContentsView();
+}
+
+ views::View* BrowserView::GetDownloadView() {
+ return static_cast<DownloadShelfView*>(GetDownloadShelf());
+}
+
+int BrowserView::GetDevToolsHeight() {
+ views::View* devtools_view = contents_split_->child_at(1);
+ return devtools_view->visible() ? devtools_view->bounds().height() : 0;
+}
+
+int BrowserView::GetDividerHeight() {
+ return contents_split_->GetDividerSize();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
// BrowserView, ImmersiveModeController::Delegate overrides:
BookmarkBarView* BrowserView::GetBookmarkBar() {

Powered by Google App Engine
This is Rietveld 408576698