| Index: ui/metro_viewer/ime_types.h
|
| diff --git a/ui/metro_viewer/ime_types.h b/ui/metro_viewer/ime_types.h
|
| index 0fb701d58e32f9092085b96eef35d14f4b5da962..d37b40bae1433738fb218380a4f5fc481a2d6e59 100644
|
| --- a/ui/metro_viewer/ime_types.h
|
| +++ b/ui/metro_viewer/ime_types.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef UI_METRO_VIEWER_IME_TYPES_H_
|
| #define UI_METRO_VIEWER_IME_TYPES_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/strings/string16.h"
|
|
|
| namespace metro_viewer {
|
| @@ -17,8 +18,8 @@ namespace metro_viewer {
|
| // on ui.gyp from metro_driver.gyp.
|
| struct UnderlineInfo {
|
| UnderlineInfo();
|
| - int32 start_offset;
|
| - int32 end_offset;
|
| + int32_t start_offset;
|
| + int32_t end_offset;
|
| bool thick;
|
| };
|
|
|
| @@ -29,8 +30,8 @@ struct Composition {
|
| Composition();
|
| ~Composition();
|
| base::string16 text;
|
| - int32 selection_start;
|
| - int32 selection_end;
|
| + int32_t selection_start;
|
| + int32_t selection_end;
|
| std::vector<UnderlineInfo> underlines;
|
| };
|
|
|
| @@ -38,10 +39,10 @@ struct Composition {
|
| // here to avoid dependency on gfx.gyp from metro_driver.gyp.
|
| struct CharacterBounds {
|
| CharacterBounds();
|
| - int32 left;
|
| - int32 top;
|
| - int32 right;
|
| - int32 bottom;
|
| + int32_t left;
|
| + int32_t top;
|
| + int32_t right;
|
| + int32_t bottom;
|
| };
|
|
|
| } // namespace metro_viewer
|
|
|