| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| 11 #include "content/browser/renderer_host/render_widget_host_view.h" | 11 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 12 #include "content/common/content_export.h" |
| 12 #include "ui/aura/window_delegate.h" | 13 #include "ui/aura/window_delegate.h" |
| 13 #include "ui/gfx/compositor/compositor_observer.h" | 14 #include "ui/gfx/compositor/compositor_observer.h" |
| 14 #include "webkit/glue/webcursor.h" | 15 #include "webkit/glue/webcursor.h" |
| 15 | 16 |
| 16 namespace WebKit { | 17 namespace WebKit { |
| 17 class WebTouchEvent; | 18 class WebTouchEvent; |
| 18 } | 19 } |
| 19 | 20 |
| 20 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 21 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 21 class AcceleratedSurfaceContainerLinux; | 22 class AcceleratedSurfaceContainerLinux; |
| 22 #endif | 23 #endif |
| 23 | 24 |
| 24 class RenderWidgetHostViewAura : public RenderWidgetHostView, | 25 class CONTENT_EXPORT RenderWidgetHostViewAura : public RenderWidgetHostView, |
| 25 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 26 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 26 public ui::CompositorObserver, | 27 public ui::CompositorObserver, |
| 27 #endif | 28 #endif |
| 28 public aura::WindowDelegate { | 29 public aura::WindowDelegate { |
| 29 public: | 30 public: |
| 30 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); | 31 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); |
| 31 virtual ~RenderWidgetHostViewAura(); | 32 virtual ~RenderWidgetHostViewAura(); |
| 32 | 33 |
| 33 // TODO(derat): Add an abstract RenderWidgetHostView::InitAsChild() method and | 34 // TODO(derat): Add an abstract RenderWidgetHostView::InitAsChild() method and |
| 34 // update callers: http://crbug.com/102450. | 35 // update callers: http://crbug.com/102450. |
| 35 void InitAsChild(); | 36 void InitAsChild(); |
| 36 | 37 |
| 37 // Overridden from RenderWidgetHostView: | 38 // Overridden from RenderWidgetHostView: |
| 38 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, | 39 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > | 161 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > |
| 161 accelerated_surface_containers_; | 162 accelerated_surface_containers_; |
| 162 #endif | 163 #endif |
| 163 | 164 |
| 164 bool skip_schedule_paint_; | 165 bool skip_schedule_paint_; |
| 165 | 166 |
| 166 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 167 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 167 }; | 168 }; |
| 168 | 169 |
| 169 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 170 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |