| 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 <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 virtual ~RenderWidgetHostViewAura(); | 341 virtual ~RenderWidgetHostViewAura(); |
| 342 | 342 |
| 343 // Exposed for tests. | 343 // Exposed for tests. |
| 344 aura::Window* window() { return window_; } | 344 aura::Window* window() { return window_; } |
| 345 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; | 345 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; |
| 346 virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE; | 346 virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE; |
| 347 | 347 |
| 348 private: | 348 private: |
| 349 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); | 349 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
| 350 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); | 350 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); |
| 351 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | |
| 352 TouchEventPositionsArentRounded); | |
| 353 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); | 351 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); |
| 354 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); | 352 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); |
| 355 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 353 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 356 SkippedDelegatedFrames); | 354 SkippedDelegatedFrames); |
| 357 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); | 355 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); |
| 358 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 356 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 359 DiscardDelegatedFrames); | 357 DiscardDelegatedFrames); |
| 360 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 358 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 361 DiscardDelegatedFramesWithLocking); | 359 DiscardDelegatedFramesWithLocking); |
| 362 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SoftwareDPIChange); | 360 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SoftwareDPIChange); |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 // etc. | 580 // etc. |
| 583 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 581 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
| 584 legacy_render_widget_host_HWND_; | 582 legacy_render_widget_host_HWND_; |
| 585 #endif | 583 #endif |
| 586 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 584 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 587 }; | 585 }; |
| 588 | 586 |
| 589 } // namespace content | 587 } // namespace content |
| 590 | 588 |
| 591 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 589 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |