| Index: ui/views/controls/webview/webview.h
|
| diff --git a/ui/views/controls/webview/webview.h b/ui/views/controls/webview/webview.h
|
| index dd753e833445513c34fdc8df916665203dfd7c9e..cb8ba7a2b3b9dc1c66bbddb866750ff644cf3bda 100644
|
| --- a/ui/views/controls/webview/webview.h
|
| +++ b/ui/views/controls/webview/webview.h
|
| @@ -5,7 +5,9 @@
|
| #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
|
| #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/render_process_host_observer.h"
|
| #include "content/public/browser/web_contents_delegate.h"
|
| @@ -136,7 +138,7 @@ class WEBVIEW_EXPORT WebView : public View,
|
| void DidDetachInterstitialPage() override;
|
| // Workaround for MSVC++ linker bug/feature that requires
|
| // instantiation of the inline IPC::Listener methods in all translation units.
|
| - void OnChannelConnected(int32 peer_id) override {}
|
| + void OnChannelConnected(int32_t peer_id) override {}
|
| void OnChannelError() override {}
|
| void OnBadMessageReceived(const IPC::Message& message) override {}
|
| void OnWebContentsFocused() override;
|
|
|