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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.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_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 <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 10
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 const scoped_refptr<media::VideoFrame>& target, 137 const scoped_refptr<media::VideoFrame>& target,
138 const base::Callback<void(bool)>& callback) OVERRIDE; 138 const base::Callback<void(bool)>& callback) OVERRIDE;
139 virtual bool CanCopyToVideoFrame() const OVERRIDE; 139 virtual bool CanCopyToVideoFrame() const OVERRIDE;
140 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; 140 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
141 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 141 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
142 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 142 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
143 virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, 143 virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
144 InputEventAckState ack_result) OVERRIDE; 144 InputEventAckState ack_result) OVERRIDE;
145 virtual void SetScrollOffsetPinning( 145 virtual void SetScrollOffsetPinning(
146 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 146 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
147 virtual void UnhandledWheelEvent(
148 const blink::WebMouseWheelEvent& event) OVERRIDE;
149 virtual InputEventAckState FilterInputEvent( 147 virtual InputEventAckState FilterInputEvent(
150 const blink::WebInputEvent& input_event) OVERRIDE; 148 const blink::WebInputEvent& input_event) OVERRIDE;
151 virtual void OnSetNeedsFlushInput() OVERRIDE; 149 virtual void OnSetNeedsFlushInput() OVERRIDE;
152 virtual void GestureEventAck(const blink::WebGestureEvent& event, 150 virtual void GestureEventAck(const blink::WebGestureEvent& event,
153 InputEventAckState ack_result) OVERRIDE; 151 InputEventAckState ack_result) OVERRIDE;
154 virtual void CreateBrowserAccessibilityManagerIfNeeded() OVERRIDE; 152 virtual void CreateBrowserAccessibilityManagerIfNeeded() OVERRIDE;
155 virtual bool LockMouse() OVERRIDE; 153 virtual bool LockMouse() OVERRIDE;
156 virtual void UnlockMouse() OVERRIDE; 154 virtual void UnlockMouse() OVERRIDE;
157 virtual void OnSwapCompositorFrame( 155 virtual void OnSwapCompositorFrame(
158 uint32 output_surface_id, 156 uint32 output_surface_id,
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 }; 350 };
353 351
354 scoped_ptr<LastFrameInfo> last_frame_info_; 352 scoped_ptr<LastFrameInfo> last_frame_info_;
355 353
356 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 354 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
357 }; 355 };
358 356
359 } // namespace content 357 } // namespace content
360 358
361 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 359 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698