| 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 975abcc8bf971cb67cd090e5a241fc18f38893a7..748e4531230c89a48dddfa27b709f5bd23fe4043 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -414,7 +414,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) {
|
| @@ -1839,6 +1839,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() {
|
|
|