Chromium Code Reviews| 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_PLUGIN_WEBPLUGIN_PROXY_H_ | 5 #ifndef CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ |
| 6 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ | 6 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/hash_tables.h" | 11 #include "base/hash_tables.h" |
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 13 #if defined(OS_MACOSX) | 13 #if defined(OS_MACOSX) |
| 14 #include "base/mac/scoped_cftyperef.h" | 14 #include "base/mac/scoped_cftyperef.h" |
| 15 #endif | 15 #endif |
| 16 #include "base/memory/scoped_handle.h" | 16 #include "base/memory/scoped_handle.h" |
| 17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
| 18 #include "base/shared_memory.h" | 18 #include "base/shared_memory.h" |
| 19 #include "base/timer.h" | 19 #include "base/timer.h" |
| 20 #include "googleurl/src/gurl.h" | 20 #include "googleurl/src/gurl.h" |
| 21 #include "ipc/ipc_message.h" | 21 #include "ipc/ipc_message.h" |
| 22 #include "skia/ext/platform_canvas.h" | |
|
brettw
2011/07/27 19:50:56
I think this can be a forward declare.
Jeff Timanus
2011/07/27 20:04:06
Yes, this include can be forward declared. I had
| |
| 22 #if defined(USE_X11) | 23 #if defined(USE_X11) |
| 23 #include "ui/base/x/x11_util.h" | 24 #include "ui/base/x/x11_util.h" |
| 24 #endif | 25 #endif |
| 25 #include "ui/gfx/surface/transport_dib.h" | 26 #include "ui/gfx/surface/transport_dib.h" |
| 26 #include "webkit/plugins/npapi/webplugin.h" | 27 #include "webkit/plugins/npapi/webplugin.h" |
| 27 | 28 |
| 28 class PluginChannel; | 29 class PluginChannel; |
| 29 | 30 |
| 30 namespace webkit { | 31 namespace webkit { |
| 31 namespace npapi { | 32 namespace npapi { |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 | 218 |
| 218 #endif | 219 #endif |
| 219 | 220 |
| 220 // Contains the routing id of the host render view. | 221 // Contains the routing id of the host render view. |
| 221 int host_render_view_routing_id_; | 222 int host_render_view_routing_id_; |
| 222 | 223 |
| 223 ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_; | 224 ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_; |
| 224 }; | 225 }; |
| 225 | 226 |
| 226 #endif // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ | 227 #endif // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ |
| OLD | NEW |