| Index: content/browser/browser_plugin/browser_plugin_guest.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
|
| index 7d2ee45066a3e7dee940d97f60a3f6e2ac174105..33262a832e5803f3baa57fbd231f72c947cd5481 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_guest.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_guest.cc
|
| @@ -4,11 +4,15 @@
|
|
|
| #include "content/browser/browser_plugin/browser_plugin_guest.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include <algorithm>
|
|
|
| +#include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/pickle.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "build/build_config.h"
|
| #include "cc/surfaces/surface.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| #include "content/browser/browser_plugin/browser_plugin_embedder.h"
|
| @@ -396,7 +400,7 @@ void BrowserPluginGuest::PointerLockPermissionResponse(bool allow) {
|
| // TODO(wjmaclean): Remove this once any remaining users of this pathway
|
| // are gone.
|
| void BrowserPluginGuest::SwapCompositorFrame(
|
| - uint32 output_surface_id,
|
| + uint32_t output_surface_id,
|
| int host_process_id,
|
| int host_routing_id,
|
| scoped_ptr<cc::CompositorFrame> frame) {
|
|
|