| 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 #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/client/activation_delegate.h" | 13 #include "ui/aura/client/activation_delegate.h" |
| 14 #include "ui/aura/window_delegate.h" | 14 #include "ui/aura/window_delegate.h" |
| 15 #include "ui/base/ime/text_input_client.h" | 15 #include "ui/base/ime/text_input_client.h" |
| 16 #include "ui/gfx/rect.h" |
| 16 #include "ui/gfx/compositor/compositor_observer.h" | 17 #include "ui/gfx/compositor/compositor_observer.h" |
| 17 #include "webkit/glue/webcursor.h" | 18 #include "webkit/glue/webcursor.h" |
| 18 | 19 |
| 19 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 20 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 20 #include "base/callback.h" | 21 #include "base/callback.h" |
| 21 #include "base/memory/ref_counted.h" | 22 #include "base/memory/ref_counted.h" |
| 22 #endif | 23 #endif |
| 23 | 24 |
| 24 namespace gfx { | 25 namespace gfx { |
| 25 class Canvas; | 26 class Canvas; |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 gfx::PluginWindowHandle current_surface_; | 230 gfx::PluginWindowHandle current_surface_; |
| 230 #endif | 231 #endif |
| 231 | 232 |
| 232 // If non-NULL we're in OnPaint() and this is the supplied canvas. | 233 // If non-NULL we're in OnPaint() and this is the supplied canvas. |
| 233 gfx::Canvas* paint_canvas_; | 234 gfx::Canvas* paint_canvas_; |
| 234 | 235 |
| 235 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 236 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 236 }; | 237 }; |
| 237 | 238 |
| 238 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 239 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |