| Index: chrome/browser/ui/views/frame/browser_view.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
|
| index 5622ab30f1073b5747014d41447051614ba931d3..66b3d61c42548bf9e596bf564122ab7cf952a657 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.h
|
| +++ b/chrome/browser/ui/views/frame/browser_view.h
|
| @@ -22,6 +22,7 @@
|
| #include "chrome/browser/ui/views/frame/browser_frame.h"
|
| #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
|
| #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h"
|
| +#include "chrome/browser/ui/views/frame/scroll_end_effect_controller_delegate.h"
|
| #include "chrome/browser/ui/views/load_complete_listener.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| #include "ui/base/models/simple_menu_model.h"
|
| @@ -96,7 +97,8 @@ class BrowserView : public BrowserWindow,
|
| public views::SingleSplitViewListener,
|
| public gfx::SysColorChangeListener,
|
| public LoadCompleteListener::Delegate,
|
| - public OmniboxPopupModelObserver {
|
| + public OmniboxPopupModelObserver,
|
| + public ScrollEndEffectControllerDelegate {
|
| public:
|
| // The browser view's class name.
|
| static const char kViewClassName[];
|
| @@ -457,6 +459,11 @@ class BrowserView : public BrowserWindow,
|
| // OmniboxPopupModelObserver overrides
|
| virtual void OnOmniboxPopupShownOrHidden() OVERRIDE;
|
|
|
| + // Overriden from ScrollEndEffectControllerDelegate:
|
| + virtual ContentsContainer* GetContentsContainer() OVERRIDE;
|
| + virtual gfx::Rect GetFrameBounds() OVERRIDE;
|
| + virtual void SetFrameBounds(gfx::Rect bounds) OVERRIDE;
|
| +
|
| // Testing interface:
|
| views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; }
|
| ContentsContainer* GetContentsContainerForTest() {
|
|
|