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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.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_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 virtual void AcceleratedSurfaceRelease() OVERRIDE; 323 virtual void AcceleratedSurfaceRelease() OVERRIDE;
324 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 324 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
325 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; 325 virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
326 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 326 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
327 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 327 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
328 328
329 virtual void SetScrollOffsetPinning( 329 virtual void SetScrollOffsetPinning(
330 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 330 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
331 virtual bool LockMouse() OVERRIDE; 331 virtual bool LockMouse() OVERRIDE;
332 virtual void UnlockMouse() OVERRIDE; 332 virtual void UnlockMouse() OVERRIDE;
333 virtual void UnhandledWheelEvent( 333 virtual void WheelEventAck(const blink::WebMouseWheelEvent& event,
334 const blink::WebMouseWheelEvent& event) OVERRIDE; 334 InputEventAckState ack_result) OVERRIDE;
335 335
336 // IPC::Sender implementation. 336 // IPC::Sender implementation.
337 virtual bool Send(IPC::Message* message) OVERRIDE; 337 virtual bool Send(IPC::Message* message) OVERRIDE;
338 338
339 // SoftwareFrameManagerClient implementation: 339 // SoftwareFrameManagerClient implementation:
340 virtual void SoftwareFrameWasFreed( 340 virtual void SoftwareFrameWasFreed(
341 uint32 output_surface_id, unsigned frame_id) OVERRIDE; 341 uint32 output_surface_id, unsigned frame_id) OVERRIDE;
342 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE; 342 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE;
343 343
344 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; 344 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE;
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 652 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
653 653
654 base::WeakPtrFactory<RenderWidgetHostViewMac> 654 base::WeakPtrFactory<RenderWidgetHostViewMac>
655 software_frame_weak_ptr_factory_; 655 software_frame_weak_ptr_factory_;
656 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 656 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
657 }; 657 };
658 658
659 } // namespace content 659 } // namespace content
660 660
661 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 661 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698