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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 325933003: Scroll offset pinning and content size notifications were only used for the Mac overlay navigation … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/render_widget_host_view_base.h" 9 #include "content/browser/renderer_host/render_widget_host_view_base.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 int gpu_host_id) OVERRIDE; 104 int gpu_host_id) OVERRIDE;
105 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 105 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
106 virtual void AcceleratedSurfaceRelease() OVERRIDE; 106 virtual void AcceleratedSurfaceRelease() OVERRIDE;
107 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 107 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
108 virtual void OnSwapCompositorFrame( 108 virtual void OnSwapCompositorFrame(
109 uint32 output_surface_id, 109 uint32 output_surface_id,
110 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; 110 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
111 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; 111 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
112 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 112 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
113 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 113 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
114 virtual void SetScrollOffsetPinning(
115 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
116 #if defined(USE_AURA) 114 #if defined(USE_AURA)
117 virtual void ProcessAckedTouchEvent( 115 virtual void ProcessAckedTouchEvent(
118 const TouchEventWithLatencyInfo& touch, 116 const TouchEventWithLatencyInfo& touch,
119 InputEventAckState ack_result) OVERRIDE; 117 InputEventAckState ack_result) OVERRIDE;
120 #endif // defined(USE_AURA) 118 #endif // defined(USE_AURA)
121 virtual bool LockMouse() OVERRIDE; 119 virtual bool LockMouse() OVERRIDE;
122 virtual void UnlockMouse() OVERRIDE; 120 virtual void UnlockMouse() OVERRIDE;
123 121
124 #if defined(OS_MACOSX) 122 #if defined(OS_MACOSX)
125 // RenderWidgetHostView implementation. 123 // RenderWidgetHostView implementation.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 // sent through it are routed to the embedding renderer process. 164 // sent through it are routed to the embedding renderer process.
167 CrossProcessFrameConnector* frame_connector_; 165 CrossProcessFrameConnector* frame_connector_;
168 166
169 private: 167 private:
170 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 168 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
171 }; 169 };
172 170
173 } // namespace content 171 } // namespace content
174 172
175 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 173 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698