| 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 "content/common/content_export.h" |
| 13 #include "ui/aura/window_delegate.h" | 13 #include "ui/aura/window_delegate.h" |
| 14 #include "ui/gfx/compositor/compositor_observer.h" | 14 #include "ui/gfx/compositor/compositor_observer.h" |
| 15 #include "webkit/glue/webcursor.h" | 15 #include "webkit/glue/webcursor.h" |
| 16 | 16 |
| 17 namespace WebKit { | 17 namespace WebKit { |
| 18 class WebTouchEvent; | 18 class WebTouchEvent; |
| 19 } | 19 } |
| 20 | 20 |
| 21 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 21 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 22 class AcceleratedSurfaceContainerLinux; | 22 class AcceleratedSurfaceContainerLinux; |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 class CONTENT_EXPORT RenderWidgetHostViewAura : public RenderWidgetHostView, | 25 class CONTENT_EXPORT RenderWidgetHostViewAura |
| 26 : NON_EXPORTED_BASE(public RenderWidgetHostView), |
| 26 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 27 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 27 public ui::CompositorObserver, | 28 public ui::CompositorObserver, |
| 28 #endif | 29 #endif |
| 29 public aura::WindowDelegate { | 30 public aura::WindowDelegate { |
| 30 public: | 31 public: |
| 31 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); | 32 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); |
| 32 virtual ~RenderWidgetHostViewAura(); | 33 virtual ~RenderWidgetHostViewAura(); |
| 33 | 34 |
| 34 // TODO(derat): Add an abstract RenderWidgetHostView::InitAsChild() method and | 35 // TODO(derat): Add an abstract RenderWidgetHostView::InitAsChild() method and |
| 35 // update callers: http://crbug.com/102450. | 36 // update callers: http://crbug.com/102450. |
| 36 void InitAsChild(); | 37 void InitAsChild(); |
| 37 | 38 |
| 38 // Overridden from RenderWidgetHostView: | 39 // Overridden from RenderWidgetHostView: |
| 39 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, | 40 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > | 155 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > |
| 155 accelerated_surface_containers_; | 156 accelerated_surface_containers_; |
| 156 #endif | 157 #endif |
| 157 | 158 |
| 158 bool skip_schedule_paint_; | 159 bool skip_schedule_paint_; |
| 159 | 160 |
| 160 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 161 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 161 }; | 162 }; |
| 162 | 163 |
| 163 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 164 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |