| 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 virtual ~RenderWidgetHostViewAura(); | 345 virtual ~RenderWidgetHostViewAura(); |
| 346 | 346 |
| 347 // Exposed for tests. | 347 // Exposed for tests. |
| 348 aura::Window* window() { return window_; } | 348 aura::Window* window() { return window_; } |
| 349 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; | 349 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; |
| 350 virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE; | 350 virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE; |
| 351 | 351 |
| 352 private: | 352 private: |
| 353 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); | 353 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
| 354 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); | 354 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); |
| 355 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 356 TouchEventPositionsArentRounded); |
| 355 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); | 357 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); |
| 356 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); | 358 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); |
| 357 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 359 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 358 SkippedDelegatedFrames); | 360 SkippedDelegatedFrames); |
| 359 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); | 361 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, OutputSurfaceIdChange); |
| 360 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 362 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 361 DiscardDelegatedFrames); | 363 DiscardDelegatedFrames); |
| 362 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, | 364 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
| 363 DiscardDelegatedFramesWithLocking); | 365 DiscardDelegatedFramesWithLocking); |
| 364 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SoftwareDPIChange); | 366 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SoftwareDPIChange); |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 // etc. | 588 // etc. |
| 587 scoped_ptr<content::LegacyRenderWidgetHostHWND> | 589 scoped_ptr<content::LegacyRenderWidgetHostHWND> |
| 588 legacy_render_widget_host_HWND_; | 590 legacy_render_widget_host_HWND_; |
| 589 #endif | 591 #endif |
| 590 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 592 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 591 }; | 593 }; |
| 592 | 594 |
| 593 } // namespace content | 595 } // namespace content |
| 594 | 596 |
| 595 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 597 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |