diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/ui/base/ime/input_method.h | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ui/base/ime/input_method.h')
| -rw-r--r-- | chromium/ui/base/ime/input_method.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/ui/base/ime/input_method.h b/chromium/ui/base/ime/input_method.h index 21b02354b2c..598fd4f76f9 100644 --- a/chromium/ui/base/ime/input_method.h +++ b/chromium/ui/base/ime/input_method.h @@ -5,10 +5,12 @@ #ifndef UI_BASE_IME_INPUT_METHOD_H_ #define UI_BASE_IME_INPUT_METHOD_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/event_types.h" +#include "build/build_config.h" #include "ui/base/ime/text_input_mode.h" #include "ui/base/ime/text_input_type.h" @@ -50,7 +52,7 @@ class InputMethod { #if defined(OS_WIN) typedef LRESULT NativeEventResult; #else - typedef int32 NativeEventResult; + typedef int32_t NativeEventResult; #endif virtual ~InputMethod() {} |