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

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

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.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 4c865e07f6a544ce56435dcda8ce998eb292c5c3..98dd34c1b5215b90c10e63e8b6f669b4920471d1 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"
@@ -101,7 +102,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[];
@@ -469,12 +471,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_; }
private:
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate

Powered by Google App Engine
This is Rietveld 408576698