| Index: content/shell/browser/shell.h
|
| diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
|
| index 4ca03f95ea72b812f70a7bed59bc66b05fb14c08..4383625d9c80b313ce63d3ee14eec719354257e3 100644
|
| --- a/content/shell/browser/shell.h
|
| +++ b/content/shell/browser/shell.h
|
| @@ -4,10 +4,10 @@
|
| #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
|
| #define CONTENT_SHELL_BROWSER_SHELL_H_
|
|
|
| +#include <stdint.h>
|
|
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_piece.h"
|
| @@ -142,9 +142,9 @@ class Shell : public WebContentsDelegate,
|
| const NativeWebKeyboardEvent& event) override;
|
| #endif
|
| bool AddMessageToConsole(WebContents* source,
|
| - int32 level,
|
| + int32_t level,
|
| const base::string16& message,
|
| - int32 line_no,
|
| + int32_t line_no,
|
| const base::string16& source_id) override;
|
| void RendererUnresponsive(WebContents* source) override;
|
| void ActivateContents(WebContents* contents) override;
|
|
|