| OLD | NEW |
| 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_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 // on Windows if the context menu is being displayed in response to a long | 337 // on Windows if the context menu is being displayed in response to a long |
| 338 // press gesture. On Windows we should be consistent like other apps and | 338 // press gesture. On Windows we should be consistent like other apps and |
| 339 // display the menu when the touch is released. | 339 // display the menu when the touch is released. |
| 340 bool OnShowContextMenu(const ContextMenuParams& params); | 340 bool OnShowContextMenu(const ContextMenuParams& params); |
| 341 | 341 |
| 342 // Used in tests to set a mock client for touch selection controller. It will | 342 // Used in tests to set a mock client for touch selection controller. It will |
| 343 // create a new touch selection controller for the new client. | 343 // create a new touch selection controller for the new client. |
| 344 void SetSelectionControllerClientForTest( | 344 void SetSelectionControllerClientForTest( |
| 345 scoped_ptr<TouchSelectionControllerClientAura> client); | 345 scoped_ptr<TouchSelectionControllerClientAura> client); |
| 346 | 346 |
| 347 // Exposed for tests. |
| 348 cc::SurfaceId SurfaceIdForTesting() const override; |
| 349 |
| 347 protected: | 350 protected: |
| 348 ~RenderWidgetHostViewAura() override; | 351 ~RenderWidgetHostViewAura() override; |
| 349 | 352 |
| 350 // Exposed for tests. | 353 // Exposed for tests. |
| 351 aura::Window* window() { return window_; } | 354 aura::Window* window() { return window_; } |
| 352 | 355 |
| 353 DelegatedFrameHost* GetDelegatedFrameHost() const { | 356 DelegatedFrameHost* GetDelegatedFrameHost() const { |
| 354 return delegated_frame_host_.get(); | 357 return delegated_frame_host_.get(); |
| 355 } | 358 } |
| 356 const ui::MotionEventAura& pointer_state() const { return pointer_state_; } | 359 const ui::MotionEventAura& pointer_state() const { return pointer_state_; } |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 700 float device_scale_factor_; | 703 float device_scale_factor_; |
| 701 | 704 |
| 702 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 705 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 703 | 706 |
| 704 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 707 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 705 }; | 708 }; |
| 706 | 709 |
| 707 } // namespace content | 710 } // namespace content |
| 708 | 711 |
| 709 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 712 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |