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 72e94e72bacfa0e660422704738e05848283c1cf..113c16098970c59190401fec0093b17a2efb9987 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" |
@@ -97,7 +98,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[]; |
@@ -454,12 +456,22 @@ class BrowserView : public BrowserWindow, |
// OmniboxPopupModelObserver overrides |
virtual void OnOmniboxPopupShownOrHidden() OVERRIDE; |
+ // Overriden from ScrollEndEffectControllerDelegate: |
+ virtual ui::Layer* GetBrowserFrameLayer() OVERRIDE; |
+ virtual ui::Layer* GetWebContentsLayer() OVERRIDE; |
+ virtual ui::Layer* GetDevToolsLayer() OVERRIDE; |
+ virtual views::View* GetNonClientView() OVERRIDE; |
+ virtual views::View* GetDownloadView() OVERRIDE; |
+ virtual int GetDevToolsHeight() OVERRIDE; |
+ virtual int GetDividerHeight() OVERRIDE; |
+ |
// Testing interface: |
views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } |
ContentsContainer* GetContentsContainerForTest() { |
return contents_container_; |
} |
views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } |
+ views::WebView* GetDevToolsWebViewForTest() { return devtools_container_; } |
sadrul
2013/09/05 16:09:02
Is this used?
rharrison
2013/09/05 20:18:34
Nope
|
private: |
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate |