| Index: ui/views/controls/textfield/textfield.h
|
| diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
|
| index 2cac671f946e0770fbcd9e496cf603604d3780db..b153edd0d89e9fcb9c2691f21a214037f25ae8c5 100644
|
| --- a/ui/views/controls/textfield/textfield.h
|
| +++ b/ui/views/controls/textfield/textfield.h
|
| @@ -5,10 +5,13 @@
|
| #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
|
| #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/strings/string16.h"
|
| @@ -290,7 +293,7 @@ class VIEWS_EXPORT Textfield : public View,
|
| int GetTextInputFlags() const override;
|
| bool CanComposeInline() const override;
|
| gfx::Rect GetCaretBounds() const override;
|
| - bool GetCompositionCharacterBounds(uint32 index,
|
| + bool GetCompositionCharacterBounds(uint32_t index,
|
| gfx::Rect* rect) const override;
|
| bool HasCompositionText() const override;
|
| bool GetTextRange(gfx::Range* range) const override;
|
|
|