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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 2240273002: Move |DidOverscrollParams| from |content::| to "ui/events/blink" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move DidOverscrollParams to ui:: Created 4 years, 4 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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 30 matching lines...) Expand all
41 #include "ui/gfx/selection_bound.h" 41 #include "ui/gfx/selection_bound.h"
42 #include "ui/touch_selection/touch_selection_controller.h" 42 #include "ui/touch_selection/touch_selection_controller.h"
43 43
44 namespace cc { 44 namespace cc {
45 class CopyOutputResult; 45 class CopyOutputResult;
46 class Layer; 46 class Layer;
47 class SurfaceFactory; 47 class SurfaceFactory;
48 class SurfaceIdAllocator; 48 class SurfaceIdAllocator;
49 } 49 }
50 50
51 namespace ui {
52 struct DidOverscrollParams;
53 }
54
51 namespace blink { 55 namespace blink {
52 class WebExternalTextureLayer; 56 class WebExternalTextureLayer;
53 class WebTouchEvent; 57 class WebTouchEvent;
54 class WebMouseEvent; 58 class WebMouseEvent;
55 } 59 }
56 60
57 namespace content { 61 namespace content {
58 class ContentViewCoreImpl; 62 class ContentViewCoreImpl;
59 class ContentViewCoreObserver; 63 class ContentViewCoreObserver;
60 class OverscrollControllerAndroid; 64 class OverscrollControllerAndroid;
61 class RenderWidgetHost; 65 class RenderWidgetHost;
62 class RenderWidgetHostImpl; 66 class RenderWidgetHostImpl;
63 class SynchronousCompositorHost; 67 class SynchronousCompositorHost;
64 struct DidOverscrollParams;
65 struct NativeWebKeyboardEvent; 68 struct NativeWebKeyboardEvent;
66 struct TextInputState; 69 struct TextInputState;
67 70
68 // ----------------------------------------------------------------------------- 71 // -----------------------------------------------------------------------------
69 // See comments in render_widget_host_view.h about this class and its members. 72 // See comments in render_widget_host_view.h about this class and its members.
70 // ----------------------------------------------------------------------------- 73 // -----------------------------------------------------------------------------
71 class CONTENT_EXPORT RenderWidgetHostViewAndroid 74 class CONTENT_EXPORT RenderWidgetHostViewAndroid
72 : public RenderWidgetHostViewBase, 75 : public RenderWidgetHostViewBase,
73 public cc::SurfaceFactoryClient, 76 public cc::SurfaceFactoryClient,
74 public ui::GestureProviderClient, 77 public ui::GestureProviderClient,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 void OnSetNeedsFlushInput() override; 147 void OnSetNeedsFlushInput() override;
145 void GestureEventAck(const blink::WebGestureEvent& event, 148 void GestureEventAck(const blink::WebGestureEvent& event,
146 InputEventAckState ack_result) override; 149 InputEventAckState ack_result) override;
147 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( 150 BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
148 BrowserAccessibilityDelegate* delegate, bool for_root_frame) override; 151 BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
149 bool LockMouse() override; 152 bool LockMouse() override;
150 void UnlockMouse() override; 153 void UnlockMouse() override;
151 void OnSwapCompositorFrame(uint32_t output_surface_id, 154 void OnSwapCompositorFrame(uint32_t output_surface_id,
152 cc::CompositorFrame frame) override; 155 cc::CompositorFrame frame) override;
153 void ClearCompositorFrame() override; 156 void ClearCompositorFrame() override;
154 void DidOverscroll(const DidOverscrollParams& params) override; 157 void DidOverscroll(const ui::DidOverscrollParams& params) override;
155 void DidStopFlinging() override; 158 void DidStopFlinging() override;
156 uint32_t GetSurfaceClientId() override; 159 uint32_t GetSurfaceClientId() override;
157 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, 160 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
158 const SkBitmap& zoomed_bitmap) override; 161 const SkBitmap& zoomed_bitmap) override;
159 std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget() 162 std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
160 override; 163 override;
161 void LockCompositingSurface() override; 164 void LockCompositingSurface() override;
162 void UnlockCompositingSurface() override; 165 void UnlockCompositingSurface() override;
163 void OnDidNavigateMainFrameToNewPage() override; 166 void OnDidNavigateMainFrameToNewPage() override;
164 167
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 gfx::Vector2dF last_scroll_offset_; 392 gfx::Vector2dF last_scroll_offset_;
390 393
391 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; 394 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
392 395
393 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 396 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
394 }; 397 };
395 398
396 } // namespace content 399 } // namespace content
397 400
398 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 401 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698