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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 291003002: Move OverscrollController to RenderWidgetHostViewAura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DCHECK_GE Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 12 matching lines...) Expand all
23 } 23 }
24 24
25 namespace ui { 25 namespace ui {
26 class DropTargetEvent; 26 class DropTargetEvent;
27 } 27 }
28 28
29 namespace content { 29 namespace content {
30 class GestureNavSimple; 30 class GestureNavSimple;
31 class OverscrollNavigationOverlay; 31 class OverscrollNavigationOverlay;
32 class RenderWidgetHostImpl; 32 class RenderWidgetHostImpl;
33 class RenderWidgetHostViewAura;
33 class ShadowLayerDelegate; 34 class ShadowLayerDelegate;
34 class TouchEditableImplAura; 35 class TouchEditableImplAura;
35 class WebContentsViewDelegate; 36 class WebContentsViewDelegate;
36 class WebContentsImpl; 37 class WebContentsImpl;
37 class WebDragDestDelegate; 38 class WebDragDestDelegate;
38 39
39 class WebContentsViewAura 40 class WebContentsViewAura
40 : public WebContentsView, 41 : public WebContentsView,
41 public RenderViewHostDelegateView, 42 public RenderViewHostDelegateView,
42 public OverscrollControllerDelegate, 43 public OverscrollControllerDelegate,
(...skipping 10 matching lines...) Expand all
53 54
54 private: 55 private:
55 class WindowObserver; 56 class WindowObserver;
56 57
57 virtual ~WebContentsViewAura(); 58 virtual ~WebContentsViewAura();
58 59
59 void SizeChangedCommon(const gfx::Size& size); 60 void SizeChangedCommon(const gfx::Size& size);
60 61
61 void EndDrag(blink::WebDragOperationsMask ops); 62 void EndDrag(blink::WebDragOperationsMask ops);
62 63
63 void InstallOverscrollControllerDelegate(RenderWidgetHostImpl* host); 64 void InstallOverscrollControllerDelegate(RenderWidgetHostViewAura* view);
64 65
65 // Creates and sets up the overlay window that will be displayed during the 66 // Creates and sets up the overlay window that will be displayed during the
66 // overscroll gesture. 67 // overscroll gesture.
67 void PrepareOverscrollWindow(); 68 void PrepareOverscrollWindow();
68 69
69 // Sets up the content window in preparation for starting an overscroll 70 // Sets up the content window in preparation for starting an overscroll
70 // gesture. 71 // gesture.
71 void PrepareContentWindowForOverscroll(); 72 void PrepareContentWindowForOverscroll();
72 73
73 // Resets any in-progress animation for the overscroll gesture. Note that this 74 // Resets any in-progress animation for the overscroll gesture. Note that this
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 225
225 scoped_ptr<TouchEditableImplAura> touch_editable_; 226 scoped_ptr<TouchEditableImplAura> touch_editable_;
226 scoped_ptr<GestureNavSimple> gesture_nav_simple_; 227 scoped_ptr<GestureNavSimple> gesture_nav_simple_;
227 228
228 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 229 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
229 }; 230 };
230 231
231 } // namespace content 232 } // namespace content
232 233
233 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 234 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698