Chromium Code Reviews| 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..f255821752d311916a953566ff9bd8164ad0a6e4 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,40 @@ void BrowserView::OnOmniboxPopupShownOrHidden() { |
| } |
| /////////////////////////////////////////////////////////////////////////////// |
| +// BrowserView, ScrollEndEffectControllerDelegate overrides: |
| + |
| +ui::Layer* BrowserView::GetBrowserFrameLayer() { |
| + return frame_ ? frame_->GetLayer() : NULL; |
|
sky
2013/09/05 21:12:57
Do you really need the NULL checks for frame_ here
rharrison
2013/09/09 20:01:17
Looking at the code again, I don't think so. I was
|
| +} |
| + |
| +ui::Layer* BrowserView::GetWebContentsLayer() { |
| + return GetActiveWebContents()->GetView()->GetNativeView()->layer(); |
| +} |
| + |
| +ui::Layer* BrowserView::GetDevToolsLayer() { |
| + return devtools_container_->GetWebContents()->GetView()->GetNativeView()-> |
| + layer(); |
| +} |
| + |
| +views::View* BrowserView::GetNonClientView() { |
| + return frame_ ? frame_->GetContentsView() : NULL; |
| +} |
| + |
| +views::View* BrowserView::GetDownloadView() { |
| + return download_shelf_.get(); |
| +} |
| + |
| +int BrowserView::GetDevToolsHeight() { |
| + views::View* devtools_view = contents_split_->child_at(1); |
|
sky
2013/09/05 21:12:57
Can't you use devtools_container_ directly?
rharrison
2013/09/09 20:01:17
Done.
|
| + return devtools_view->visible() ? devtools_view->bounds().height() : 0; |
| +} |
| + |
| +int BrowserView::GetDividerHeight() { |
| + return contents_split_->GetDividerSize(); |
| +} |
| + |
| + |
|
sky
2013/09/05 21:12:57
nit: only one newline.
rharrison
2013/09/09 20:01:17
Done.
|
| +/////////////////////////////////////////////////////////////////////////////// |
| // BrowserView, ImmersiveModeController::Delegate overrides: |
| BookmarkBarView* BrowserView::GetBookmarkBar() { |