diff options
| author | avi <avi@chromium.org> | 2015-12-23 00:05:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-23 08:06:02 +0000 |
| commit | 20f6a6d5309f54d01b218a2df393e80fd43f166c (patch) | |
| tree | d8f63ef92e379665cc036e45a71419dabb15ad9d /ui/base | |
| parent | 6d4faa11235e13e35c202ec5411360cffbb81111 (diff) | |
| download | chromium_src-20f6a6d5309f54d01b218a2df393e80fd43f166c.zip chromium_src-20f6a6d5309f54d01b218a2df393e80fd43f166c.tar.gz chromium_src-20f6a6d5309f54d01b218a2df393e80fd43f166c.tar.bz2 | |
Switch to standard integer types in ui/base/.
BUG=138542
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/1547893002
Cr-Commit-Position: refs/heads/master@{#366729}
Diffstat (limited to 'ui/base')
226 files changed, 664 insertions, 372 deletions
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc index e23f187..36c9856 100644 --- a/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc @@ -4,18 +4,21 @@ #include "ui/base/accelerators/accelerator.h" -#if defined(OS_WIN) -#include <windows.h> -#endif +#include <stdint.h> #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/l10n/l10n_util.h" #include "ui/events/event.h" #include "ui/strings/grit/ui_strings.h" +#if defined(OS_WIN) +#include <windows.h> +#endif + #if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX)) #include "ui/events/keycodes/keyboard_code_conversion.h" #endif @@ -217,7 +220,7 @@ base::string16 Accelerator::GetShortcutText() const { key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR)); shortcut += key; #elif defined(USE_AURA) || defined(OS_MACOSX) - const uint16 c = DomCodeToUsLayoutCharacter( + const uint16_t c = DomCodeToUsLayoutCharacter( UsLayoutKeyboardCodeToDomCode(key_code_), false); if (c != 0) shortcut += diff --git a/ui/base/accelerators/accelerator_history.h b/ui/base/accelerators/accelerator_history.h index 435e752..22aaf1f 100644 --- a/ui/base/accelerators/accelerator_history.h +++ b/ui/base/accelerators/accelerator_history.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_ #define UI_BASE_ACCELERATORS_ACCELERATOR_HISTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h index 8398c8f..905a8c9 100644 --- a/ui/base/accelerators/accelerator_manager.h +++ b/ui/base/accelerators/accelerator_manager.h @@ -9,7 +9,7 @@ #include <map> #include <utility> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/ui_base_export.h" #include "ui/events/event_constants.h" diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc index 1f8db027..0236d56 100644 --- a/ui/base/accelerators/accelerator_manager_unittest.cc +++ b/ui/base/accelerators/accelerator_manager_unittest.cc @@ -5,6 +5,7 @@ #include "ui/base/accelerators/accelerator_manager.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/ui/base/accelerators/menu_label_accelerator_util_linux.cc b/ui/base/accelerators/menu_label_accelerator_util_linux.cc index 0a00f82..1213ec1 100644 --- a/ui/base/accelerators/menu_label_accelerator_util_linux.cc +++ b/ui/base/accelerators/menu_label_accelerator_util_linux.cc @@ -4,6 +4,8 @@ #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" +#include <stddef.h> + #include "base/strings/string_util.h" namespace { diff --git a/ui/base/accelerators/menu_label_accelerator_util_linux_unittest.cc b/ui/base/accelerators/menu_label_accelerator_util_linux_unittest.cc index 0811e2b..d704ef5 100644 --- a/ui/base/accelerators/menu_label_accelerator_util_linux_unittest.cc +++ b/ui/base/accelerators/menu_label_accelerator_util_linux_unittest.cc @@ -4,7 +4,9 @@ #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace ui { diff --git a/ui/base/accelerators/platform_accelerator_cocoa.h b/ui/base/accelerators/platform_accelerator_cocoa.h index c6fed1d..5685f5f 100644 --- a/ui/base/accelerators/platform_accelerator_cocoa.h +++ b/ui/base/accelerators/platform_accelerator_cocoa.h @@ -8,6 +8,7 @@ #include <Foundation/Foundation.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ui/base/accelerators/platform_accelerator.h" namespace ui { diff --git a/ui/base/android/ui_base_jni_registrar.cc b/ui/base/android/ui_base_jni_registrar.cc index ad6a156..f0be915 100644 --- a/ui/base/android/ui_base_jni_registrar.cc +++ b/ui/base/android/ui_base_jni_registrar.cc @@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/macros.h" #include "ui/base/clipboard/clipboard_android.h" #include "ui/base/device_form_factor_android.h" #include "ui/base/l10n/l10n_util_android.h" diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h index 8a5e5dc..40af4df 100644 --- a/ui/base/clipboard/clipboard.h +++ b/ui/base/clipboard/clipboard.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_CLIPBOARD_CLIPBOARD_H_ #define UI_BASE_CLIPBOARD_CLIPBOARD_H_ +#include <stddef.h> #include <stdint.h> #include <map> @@ -13,11 +14,13 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/process/process.h" #include "base/strings/string16.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_checker.h" +#include "build/build_config.h" #include "ui/base/clipboard/clipboard_types.h" #include "ui/base/ui_base_export.h" @@ -114,7 +117,7 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { // Copyable and assignable, since this is essentially an opaque value type. }; - static bool IsSupportedClipboardType(int32 type) { + static bool IsSupportedClipboardType(int32_t type) { switch (type) { case CLIPBOARD_TYPE_COPY_PASTE: return true; @@ -126,7 +129,7 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { return false; } - static ClipboardType FromInt(int32 type) { + static ClipboardType FromInt(int32_t type) { return static_cast<ClipboardType>(type); } @@ -176,8 +179,8 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { virtual void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const = 0; + uint32_t* fragment_start, + uint32_t* fragment_end) const = 0; // Reads RTF from the clipboard, if available. Stores the result as a byte // vector. diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc index 6282058..47465b0 100644 --- a/ui/base/clipboard/clipboard_android.cc +++ b/ui/base/clipboard/clipboard_android.cc @@ -282,7 +282,7 @@ ClipboardAndroid::~ClipboardAndroid() { DCHECK(CalledOnValidThread()); } -uint64 ClipboardAndroid::GetSequenceNumber(ClipboardType /* type */) const { +uint64_t ClipboardAndroid::GetSequenceNumber(ClipboardType /* type */) const { DCHECK(CalledOnValidThread()); // TODO: implement this. For now this interface will advertise // that the clipboard never changes. That's fine as long as we @@ -352,8 +352,8 @@ void ClipboardAndroid::ReadAsciiText(ClipboardType type, void ClipboardAndroid::ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const { + uint32_t* fragment_start, + uint32_t* fragment_end) const { DCHECK(CalledOnValidThread()); DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE); if (src_url) @@ -363,7 +363,7 @@ void ClipboardAndroid::ReadHTML(ClipboardType type, *markup = base::UTF8ToUTF16(input); *fragment_start = 0; - *fragment_end = static_cast<uint32>(markup->length()); + *fragment_end = static_cast<uint32_t>(markup->length()); } void ClipboardAndroid::ReadRTF(ClipboardType type, std::string* result) const { diff --git a/ui/base/clipboard/clipboard_android.h b/ui/base/clipboard/clipboard_android.h index 660475a..2ec2f46 100644 --- a/ui/base/clipboard/clipboard_android.h +++ b/ui/base/clipboard/clipboard_android.h @@ -8,6 +8,10 @@ #include "ui/base/clipboard/clipboard.h" #include <jni.h> +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" namespace ui { @@ -21,7 +25,7 @@ class ClipboardAndroid : public Clipboard { ~ClipboardAndroid() override; // Clipboard overrides: - uint64 GetSequenceNumber(ClipboardType type) const override; + uint64_t GetSequenceNumber(ClipboardType type) const override; bool IsFormatAvailable(const FormatType& format, ClipboardType type) const override; void Clear(ClipboardType type) override; @@ -33,8 +37,8 @@ class ClipboardAndroid : public Clipboard { void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const override; + uint32_t* fragment_start, + uint32_t* fragment_end) const override; void ReadRTF(ClipboardType type, std::string* result) const override; SkBitmap ReadImage(ClipboardType type) const override; void ReadCustomData(ClipboardType clipboard_type, diff --git a/ui/base/clipboard/clipboard_aura.cc b/ui/base/clipboard/clipboard_aura.cc index cfe4986..11bdd54 100644 --- a/ui/base/clipboard/clipboard_aura.cc +++ b/ui/base/clipboard/clipboard_aura.cc @@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/base/clipboard/clipboard_aura.h b/ui/base/clipboard/clipboard_aura.h index 39fd07e..e13f177 100644 --- a/ui/base/clipboard/clipboard_aura.h +++ b/ui/base/clipboard/clipboard_aura.h @@ -5,6 +5,10 @@ #ifndef UI_BASE_CLIPBOARD_CLIPBOARD_AURA_H_ #define UI_BASE_CLIPBOARD_CLIPBOARD_AURA_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "ui/base/clipboard/clipboard.h" namespace ui { @@ -29,8 +33,8 @@ class ClipboardAura : public Clipboard { void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const override; + uint32_t* fragment_start, + uint32_t* fragment_end) const override; void ReadRTF(ClipboardType type, std::string* result) const override; SkBitmap ReadImage(ClipboardType type) const override; void ReadCustomData(ClipboardType clipboard_type, diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index d9759b8..29061eb 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -14,6 +14,7 @@ #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/ui/base/clipboard/clipboard_aurax11.h b/ui/base/clipboard/clipboard_aurax11.h index 1b30a3b..9a735d7 100644 --- a/ui/base/clipboard/clipboard_aurax11.h +++ b/ui/base/clipboard/clipboard_aurax11.h @@ -7,6 +7,10 @@ #include "ui/base/clipboard/clipboard.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace ui { @@ -19,7 +23,7 @@ class ClipboardAuraX11 : public Clipboard { ~ClipboardAuraX11() override; // Clipboard overrides: - uint64 GetSequenceNumber(ClipboardType type) const override; + uint64_t GetSequenceNumber(ClipboardType type) const override; bool IsFormatAvailable(const FormatType& format, ClipboardType type) const override; void Clear(ClipboardType type) override; @@ -31,8 +35,8 @@ class ClipboardAuraX11 : public Clipboard { void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const override; + uint32_t* fragment_start, + uint32_t* fragment_end) const override; void ReadRTF(ClipboardType type, std::string* result) const override; SkBitmap ReadImage(ClipboardType type) const override; void ReadCustomData(ClipboardType clipboard_type, diff --git a/ui/base/clipboard/clipboard_mac.h b/ui/base/clipboard/clipboard_mac.h index f14bd00..3a4ef4a 100644 --- a/ui/base/clipboard/clipboard_mac.h +++ b/ui/base/clipboard/clipboard_mac.h @@ -5,6 +5,10 @@ #ifndef UI_BASE_CLIPBOARD_CLIPBOARD_MAC_H_ #define UI_BASE_CLIPBOARD_CLIPBOARD_MAC_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "ui/base/clipboard/clipboard.h" namespace ui { @@ -29,8 +33,8 @@ class ClipboardMac : public Clipboard { void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const override; + uint32_t* fragment_start, + uint32_t* fragment_end) const override; void ReadRTF(ClipboardType type, std::string* result) const override; SkBitmap ReadImage(ClipboardType type) const override; void ReadCustomData(ClipboardType clipboard_type, diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h index 2b298da..122fb4e 100644 --- a/ui/base/clipboard/clipboard_test_template.h +++ b/ui/base/clipboard/clipboard_test_template.h @@ -14,9 +14,10 @@ #include "build/build_config.h" +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/pickle.h" @@ -143,8 +144,8 @@ TYPED_TEST(ClipboardTest, HTMLTest) { Contains(ASCIIToUTF16(Clipboard::kMimeTypeHTML))); EXPECT_TRUE(this->clipboard().IsFormatAvailable( Clipboard::GetHtmlFormatType(), CLIPBOARD_TYPE_COPY_PASTE)); - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; this->clipboard().ReadHTML(CLIPBOARD_TYPE_COPY_PASTE, &markup_result, &url_result, &fragment_start, &fragment_end); EXPECT_LE(markup.size(), fragment_end - fragment_start); @@ -214,8 +215,8 @@ TYPED_TEST(ClipboardTest, MultipleBufferTest) { EXPECT_EQ(text, text_result); base::string16 markup_result; - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; this->clipboard().ReadHTML(CLIPBOARD_TYPE_SELECTION, &markup_result, &url_result, &fragment_start, &fragment_end); EXPECT_LE(markup.size(), fragment_end - fragment_start); @@ -240,8 +241,8 @@ TYPED_TEST(ClipboardTest, TrickyHTMLTest) { Contains(ASCIIToUTF16(Clipboard::kMimeTypeHTML))); EXPECT_TRUE(this->clipboard().IsFormatAvailable( Clipboard::GetHtmlFormatType(), CLIPBOARD_TYPE_COPY_PASTE)); - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; this->clipboard().ReadHTML(CLIPBOARD_TYPE_COPY_PASTE, &markup_result, &url_result, &fragment_start, &fragment_end); EXPECT_LE(markup.size(), fragment_end - fragment_start); @@ -270,8 +271,8 @@ TYPED_TEST(ClipboardTest, UnicodeHTMLTest) { Contains(ASCIIToUTF16(Clipboard::kMimeTypeHTML))); EXPECT_TRUE(this->clipboard().IsFormatAvailable( Clipboard::GetHtmlFormatType(), CLIPBOARD_TYPE_COPY_PASTE)); - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; this->clipboard().ReadHTML(CLIPBOARD_TYPE_COPY_PASTE, &markup_result, &url_result, &fragment_start, &fragment_end); EXPECT_LE(markup.size(), fragment_end - fragment_start); @@ -323,8 +324,8 @@ TYPED_TEST(ClipboardTest, MultiFormatTest) { Clipboard::GetPlainTextWFormatType(), CLIPBOARD_TYPE_COPY_PASTE)); EXPECT_TRUE(this->clipboard().IsFormatAvailable( Clipboard::GetPlainTextFormatType(), CLIPBOARD_TYPE_COPY_PASTE)); - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; this->clipboard().ReadHTML(CLIPBOARD_TYPE_COPY_PASTE, &markup_result, &url_result, &fragment_start, &fragment_end); EXPECT_LE(markup.size(), fragment_end - fragment_start); @@ -374,7 +375,7 @@ TYPED_TEST(ClipboardTest, URLTest) { static void TestBitmapWrite(Clipboard* clipboard, const gfx::Size& size, - const uint32* bitmap_data) { + const uint32_t* bitmap_data) { { ScopedClipboardWriter scw(CLIPBOARD_TYPE_COPY_PASTE); SkBitmap bitmap; @@ -391,7 +392,7 @@ static void TestBitmapWrite(Clipboard* clipboard, EXPECT_EQ(size, gfx::Size(image.width(), image.height())); SkAutoLockPixels image_lock(image); for (int j = 0; j < image.height(); ++j) { - const uint32* row_address = image.getAddr32(0, j); + const uint32_t* row_address = image.getAddr32(0, j); for (int i = 0; i < image.width(); ++i) { int offset = i + j * image.width(); EXPECT_EQ(bitmap_data[offset], row_address[i]) << "i = " << i @@ -401,7 +402,7 @@ static void TestBitmapWrite(Clipboard* clipboard, } TYPED_TEST(ClipboardTest, SharedBitmapTest) { - const uint32 fake_bitmap_1[] = { + const uint32_t fake_bitmap_1[] = { 0x46061626, 0xf69f5988, 0x793f2937, 0xfa55b986, 0x78772152, 0x87692a30, 0x36322a25, 0x4320401b, 0x91848c21, 0xc3177b3c, 0x6946155c, 0x64171952, @@ -411,7 +412,7 @@ TYPED_TEST(ClipboardTest, SharedBitmapTest) { TestBitmapWrite(&this->clipboard(), gfx::Size(4, 3), fake_bitmap_1); } - const uint32 fake_bitmap_2[] = { + const uint32_t fake_bitmap_2[] = { 0x46061626, 0xf69f5988, 0x793f2937, 0xfa55b986, 0x78772152, 0x87692a30, @@ -524,8 +525,8 @@ TYPED_TEST(ClipboardTest, HyperlinkTest) { EXPECT_TRUE(this->clipboard().IsFormatAvailable( Clipboard::GetHtmlFormatType(), CLIPBOARD_TYPE_COPY_PASTE)); - uint32 fragment_start; - uint32 fragment_end; + uint32_t fragment_start; + uint32_t fragment_end; this->clipboard().ReadHTML(CLIPBOARD_TYPE_COPY_PASTE, &html_result, &url_result, &fragment_start, &fragment_end); EXPECT_EQ(kExpectedHtml, @@ -615,7 +616,7 @@ TYPED_TEST(ClipboardTest, WriteEverything) { // written to. // TODO(dcheng): Add a version to test CLIPBOARD_TYPE_SELECTION. TYPED_TEST(ClipboardTest, GetSequenceNumber) { - const uint64 first_sequence_number = + const uint64_t first_sequence_number = this->clipboard().GetSequenceNumber(CLIPBOARD_TYPE_COPY_PASTE); { @@ -627,7 +628,7 @@ TYPED_TEST(ClipboardTest, GetSequenceNumber) { // the message loop to make sure we get the notification. base::RunLoop().RunUntilIdle(); - const uint64 second_sequence_number = + const uint64_t second_sequence_number = this->clipboard().GetSequenceNumber(CLIPBOARD_TYPE_COPY_PASTE); EXPECT_NE(first_sequence_number, second_sequence_number); diff --git a/ui/base/clipboard/clipboard_util_win.cc b/ui/base/clipboard/clipboard_util_win.cc index ed5fe5f..9f23635 100644 --- a/ui/base/clipboard/clipboard_util_win.cc +++ b/ui/base/clipboard/clipboard_util_win.cc @@ -8,9 +8,9 @@ #include <shlwapi.h> #include <wininet.h> // For INTERNET_MAX_URL_LENGTH. -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" diff --git a/ui/base/clipboard/clipboard_util_win.h b/ui/base/clipboard/clipboard_util_win.h index c2171da..c870916 100644 --- a/ui/base/clipboard/clipboard_util_win.h +++ b/ui/base/clipboard/clipboard_util_win.h @@ -8,6 +8,7 @@ #define UI_BASE_CLIPBOARD_CLIPBOARD_UTIL_WIN_H_ #include <shlobj.h> +#include <stddef.h> #include <map> #include <string> #include <vector> diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index 92f0ef0..712b7e8 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -10,11 +10,11 @@ #include <shellapi.h> #include <shlobj.h> -#include "base/basictypes.h" #include "base/bind.h" #include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" @@ -418,7 +418,7 @@ ClipboardWin::ClipboardWin() { ClipboardWin::~ClipboardWin() { } -uint64 ClipboardWin::GetSequenceNumber(ClipboardType type) const { +uint64_t ClipboardWin::GetSequenceNumber(ClipboardType type) const { DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE); return ::GetClipboardSequenceNumber(); } @@ -520,8 +520,8 @@ void ClipboardWin::ReadAsciiText(ClipboardType type, void ClipboardWin::ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const { + uint32_t* fragment_start, + uint32_t* fragment_end) const { DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE); markup->clear(); @@ -565,8 +565,8 @@ void ClipboardWin::ReadHTML(ClipboardType type, offsets.push_back(end_index - html_start); markup->assign(base::UTF8ToUTF16AndAdjustOffsets(cf_html.data() + html_start, &offsets)); - *fragment_start = base::checked_cast<uint32>(offsets[0]); - *fragment_end = base::checked_cast<uint32>(offsets[1]); + *fragment_start = base::checked_cast<uint32_t>(offsets[0]); + *fragment_end = base::checked_cast<uint32_t>(offsets[1]); } void ClipboardWin::ReadRTF(ClipboardType type, std::string* result) const { diff --git a/ui/base/clipboard/clipboard_win.h b/ui/base/clipboard/clipboard_win.h index 49ceb972..63bdfa1 100644 --- a/ui/base/clipboard/clipboard_win.h +++ b/ui/base/clipboard/clipboard_win.h @@ -7,6 +7,10 @@ #include "ui/base/clipboard/clipboard.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace ui { @@ -19,7 +23,7 @@ class ClipboardWin : public Clipboard { ~ClipboardWin() override; // Clipboard overrides: - uint64 GetSequenceNumber(ClipboardType type) const override; + uint64_t GetSequenceNumber(ClipboardType type) const override; bool IsFormatAvailable(const FormatType& format, ClipboardType type) const override; void Clear(ClipboardType type) override; @@ -31,8 +35,8 @@ class ClipboardWin : public Clipboard { void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const override; + uint32_t* fragment_start, + uint32_t* fragment_end) const override; void ReadRTF(ClipboardType type, std::string* result) const override; SkBitmap ReadImage(ClipboardType type) const override; void ReadCustomData(ClipboardType clipboard_type, diff --git a/ui/base/clipboard/custom_data_helper.h b/ui/base/clipboard/custom_data_helper.h index c1778c7..55a2b3b 100644 --- a/ui/base/clipboard/custom_data_helper.h +++ b/ui/base/clipboard/custom_data_helper.h @@ -10,10 +10,13 @@ #ifndef UI_BASE_CLIPBOARD_CUSTOM_DATA_HELPER_H_ #define UI_BASE_CLIPBOARD_CUSTOM_DATA_HELPER_H_ +#include <stddef.h> + #include <map> #include <vector> #include "base/strings/string16.h" +#include "build/build_config.h" #include "ui/base/ui_base_export.h" namespace base { diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h index 664dc23..a7e0645 100644 --- a/ui/base/clipboard/scoped_clipboard_writer.h +++ b/ui/base/clipboard/scoped_clipboard_writer.h @@ -13,6 +13,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string16.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" diff --git a/ui/base/cocoa/constrained_window/constrained_window_animation.mm b/ui/base/cocoa/constrained_window/constrained_window_animation.mm index 17cea54..3618a1b9 100644 --- a/ui/base/cocoa/constrained_window/constrained_window_animation.mm +++ b/ui/base/cocoa/constrained_window/constrained_window_animation.mm @@ -4,9 +4,12 @@ #import "ui/base/cocoa/constrained_window/constrained_window_animation.h" +#include <stdint.h> + #include "base/files/file_path.h" #include "base/location.h" #import "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/native_library.h" #include "ui/gfx/animation/tween.h" @@ -34,8 +37,8 @@ extern "C" { typedef float float32; -typedef int32 CGSWindow; -typedef int32 CGSConnection; +typedef int32_t CGSWindow; +typedef int32_t CGSConnection; typedef struct { float32 x; @@ -53,8 +56,8 @@ CGError CGSSetWindowTransform(const CGSConnection cid, CGAffineTransform transform); CGError CGSSetWindowWarp(const CGSConnection cid, const CGSWindow wid, - int32 w, - int32 h, + int32_t w, + int32_t h, CGPointWarp* mesh); CGError CGSSetWindowAlpha(const CGSConnection cid, const CGSWindow wid, diff --git a/ui/base/cocoa/controls/blue_label_button_unittest.mm b/ui/base/cocoa/controls/blue_label_button_unittest.mm index 4118ca8..0427d9b 100644 --- a/ui/base/cocoa/controls/blue_label_button_unittest.mm +++ b/ui/base/cocoa/controls/blue_label_button_unittest.mm @@ -5,6 +5,7 @@ #import "ui/base/cocoa/controls/blue_label_button.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "testing/gtest_mac.h" #import "ui/gfx/test/ui_cocoa_test_helper.h" diff --git a/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm b/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm index 9ac7009..e137d55 100644 --- a/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm +++ b/ui/base/cocoa/controls/hover_image_menu_button_unittest.mm @@ -5,6 +5,7 @@ #import "ui/base/cocoa/controls/hover_image_menu_button.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #import "testing/gtest_mac.h" #import "ui/base/cocoa/controls/hover_image_menu_button_cell.h" #include "ui/events/test/cocoa_test_event_utils.h" diff --git a/ui/base/cocoa/focus_tracker.mm b/ui/base/cocoa/focus_tracker.mm index ef247cc..bf74b1a 100644 --- a/ui/base/cocoa/focus_tracker.mm +++ b/ui/base/cocoa/focus_tracker.mm @@ -4,7 +4,6 @@ #import "ui/base/cocoa/focus_tracker.h" -#include "base/basictypes.h" @implementation FocusTracker diff --git a/ui/base/cocoa/remote_layer_api.h b/ui/base/cocoa/remote_layer_api.h index 8d704af..7b97c7e 100644 --- a/ui/base/cocoa/remote_layer_api.h +++ b/ui/base/cocoa/remote_layer_api.h @@ -9,6 +9,8 @@ #import <Cocoa/Cocoa.h> #endif // __OBJC__ +#include <stdint.h> + #include "ui/base/ui_base_export.h" // The CGSConnectionID is used to create the CAContext in the process that is diff --git a/ui/base/cocoa/scoped_cg_context_smooth_fonts.h b/ui/base/cocoa/scoped_cg_context_smooth_fonts.h index 1624d46..f080d78 100644 --- a/ui/base/cocoa/scoped_cg_context_smooth_fonts.h +++ b/ui/base/cocoa/scoped_cg_context_smooth_fonts.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_COCOA_SCOPED_CG_CONTEXT_SMOOTH_FONTS_H_ #define UI_BASE_COCOA_SCOPED_CG_CONTEXT_SMOOTH_FONTS_H_ +#include "base/macros.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/ui/base/cocoa/three_part_image.h b/ui/base/cocoa/three_part_image.h index 01a6691..ebeef5f 100644 --- a/ui/base/cocoa/three_part_image.h +++ b/ui/base/cocoa/three_part_image.h @@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/cocoa/tracking_area.h b/ui/base/cocoa/tracking_area.h index 361fd6d..07eb70b 100644 --- a/ui/base/cocoa/tracking_area.h +++ b/ui/base/cocoa/tracking_area.h @@ -8,6 +8,7 @@ #import <AppKit/AppKit.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" @class CrTrackingAreaOwnerProxy; diff --git a/ui/base/cursor/cursor_loader.h b/ui/base/cursor/cursor_loader.h index f69d23c..cf90846 100644 --- a/ui/base/cursor/cursor_loader.h +++ b/ui/base/cursor/cursor_loader.h @@ -6,6 +6,7 @@ #define UI_BASE_CURSOR_CURSOR_LOADER_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/display.h" diff --git a/ui/base/cursor/cursor_loader_ozone.h b/ui/base/cursor/cursor_loader_ozone.h index 26f8bac..6cd67dc 100644 --- a/ui/base/cursor/cursor_loader_ozone.h +++ b/ui/base/cursor/cursor_loader_ozone.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_loader.h" diff --git a/ui/base/cursor/cursor_loader_win.h b/ui/base/cursor/cursor_loader_win.h index fe36da3..270198b 100644 --- a/ui/base/cursor/cursor_loader_win.h +++ b/ui/base/cursor/cursor_loader_win.h @@ -6,6 +6,7 @@ #define UI_BASE_CURSOR_CURSOR_LOADER_WIN_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/cursor/cursor_loader.h" namespace ui { diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc index 8ad1f0e..aff40d2 100644 --- a/ui/base/cursor/cursor_loader_x11.cc +++ b/ui/base/cursor/cursor_loader_x11.cc @@ -9,6 +9,7 @@ #include <X11/Xlib.h> #include "base/logging.h" +#include "build/build_config.h" #include "skia/ext/image_operations.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_util.h" diff --git a/ui/base/cursor/cursor_loader_x11.h b/ui/base/cursor/cursor_loader_x11.h index 8c947d1..7523db3 100644 --- a/ui/base/cursor/cursor_loader_x11.h +++ b/ui/base/cursor/cursor_loader_x11.h @@ -9,6 +9,7 @@ #include <map> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_loader.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/cursor/cursors_aura.cc b/ui/base/cursor/cursors_aura.cc index 2d38434..8dca8ff 100644 --- a/ui/base/cursor/cursors_aura.cc +++ b/ui/base/cursor/cursors_aura.cc @@ -4,6 +4,9 @@ #include "ui/base/cursor/cursors_aura.h" +#include <stddef.h> + +#include "base/macros.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/geometry/point.h" diff --git a/ui/base/cursor/image_cursors.cc b/ui/base/cursor/image_cursors.cc index e69a794..54b851e 100644 --- a/ui/base/cursor/image_cursors.cc +++ b/ui/base/cursor/image_cursors.cc @@ -5,8 +5,10 @@ #include "ui/base/cursor/image_cursors.h" #include <float.h> +#include <stddef.h> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_loader.h" diff --git a/ui/base/cursor/image_cursors.h b/ui/base/cursor/image_cursors.h index 25676ca..be3c7fb 100644 --- a/ui/base/cursor/image_cursors.h +++ b/ui/base/cursor/image_cursors.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_CURSOR_IMAGE_CURSORS_H_ #define UI_BASE_CURSOR_IMAGE_CURSORS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "ui/base/cursor/cursor.h" diff --git a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h index 53c5999..e621c5e 100644 --- a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h +++ b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/cursor/cursor.h" diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h index 78ea3a3..35d47b2 100644 --- a/ui/base/default_theme_provider.h +++ b/ui/base/default_theme_provider.h @@ -7,8 +7,9 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/base/theme_provider.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/dragdrop/download_file_interface.h b/ui/base/dragdrop/download_file_interface.h index 327fe79..db82ff2 100644 --- a/ui/base/dragdrop/download_file_interface.h +++ b/ui/base/dragdrop/download_file_interface.h @@ -7,7 +7,6 @@ #include "build/build_config.h" -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/dragdrop/drag_drop_types.h b/ui/base/dragdrop/drag_drop_types.h index 6b25f13..cc54560 100644 --- a/ui/base/dragdrop/drag_drop_types.h +++ b/ui/base/dragdrop/drag_drop_types.h @@ -5,7 +5,9 @@ #ifndef UI_BASE_DRAGDROP_DRAG_DROP_TYPES_H_ #define UI_BASE_DRAGDROP_DRAG_DROP_TYPES_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "build/build_config.h" #include "ui/base/ui_base_export.h" namespace ui { @@ -27,8 +29,8 @@ class UI_BASE_EXPORT DragDropTypes { }; #if defined(OS_WIN) - static uint32 DragOperationToDropEffect(int drag_operation); - static int DropEffectToDragOperation(uint32 effect); + static uint32_t DragOperationToDropEffect(int drag_operation); + static int DropEffectToDragOperation(uint32_t effect); #endif }; diff --git a/ui/base/dragdrop/drag_drop_types_win.cc b/ui/base/dragdrop/drag_drop_types_win.cc index d6beff5..d189b82 100644 --- a/ui/base/dragdrop/drag_drop_types_win.cc +++ b/ui/base/dragdrop/drag_drop_types_win.cc @@ -5,11 +5,11 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include <oleidl.h> +#include <stdint.h> namespace ui { -int ui::DragDropTypes::DropEffectToDragOperation( - uint32 effect) { +int ui::DragDropTypes::DropEffectToDragOperation(uint32_t effect) { int drag_operation = DRAG_NONE; if (effect & DROPEFFECT_LINK) drag_operation |= DRAG_LINK; @@ -20,8 +20,8 @@ int ui::DragDropTypes::DropEffectToDragOperation( return drag_operation; } -uint32 ui::DragDropTypes::DragOperationToDropEffect(int drag_operation) { - uint32 drop_effect = DROPEFFECT_NONE; +uint32_t ui::DragDropTypes::DragOperationToDropEffect(int drag_operation) { + uint32_t drop_effect = DROPEFFECT_NONE; if (drag_operation & DRAG_LINK) drop_effect |= DROPEFFECT_LINK; if (drag_operation & DRAG_COPY) diff --git a/ui/base/dragdrop/drag_source_win.h b/ui/base/dragdrop/drag_source_win.h index 9d442a8..6051de2 100644 --- a/ui/base/dragdrop/drag_source_win.h +++ b/ui/base/dragdrop/drag_source_win.h @@ -8,7 +8,7 @@ #include <objidl.h> #include <wrl/implements.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc index e8723c8..3e69b15 100644 --- a/ui/base/dragdrop/drag_utils.cc +++ b/ui/base/dragdrop/drag_utils.cc @@ -6,7 +6,9 @@ #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" diff --git a/ui/base/dragdrop/drag_utils_win.cc b/ui/base/dragdrop/drag_utils_win.cc index 9fedd42..1921338 100644 --- a/ui/base/dragdrop/drag_utils_win.cc +++ b/ui/base/dragdrop/drag_utils_win.cc @@ -7,6 +7,7 @@ #include <objidl.h> #include <shlobj.h> #include <shobjidl.h> +#include <stddef.h> #include "base/win/scoped_comptr.h" #include "base/win/scoped_hdc.h" diff --git a/ui/base/dragdrop/drop_target_event.h b/ui/base/dragdrop/drop_target_event.h index 18c0630..adef99f 100644 --- a/ui/base/dragdrop/drop_target_event.h +++ b/ui/base/dragdrop/drop_target_event.h @@ -5,8 +5,9 @@ #ifndef UI_BASE_DRAGDROP_DROP_TARGET_EVENT_H_ #define UI_BASE_DRAGDROP_DROP_TARGET_EVENT_H_ -#include "ui/events/event.h" +#include "base/macros.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/events/event.h" namespace ui { diff --git a/ui/base/dragdrop/drop_target_win.h b/ui/base/dragdrop/drop_target_win.h index 2cc5493c..4694d2e 100644 --- a/ui/base/dragdrop/drop_target_win.h +++ b/ui/base/dragdrop/drop_target_win.h @@ -7,6 +7,7 @@ #include <objidl.h> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/dragdrop/os_exchange_data.cc b/ui/base/dragdrop/os_exchange_data.cc index f67e694..00e5819 100644 --- a/ui/base/dragdrop/os_exchange_data.cc +++ b/ui/base/dragdrop/os_exchange_data.cc @@ -5,6 +5,7 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "base/pickle.h" +#include "build/build_config.h" #include "url/gurl.h" namespace ui { diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h index 5160530..5917c84 100644 --- a/ui/base/dragdrop/os_exchange_data.h +++ b/ui/base/dragdrop/os_exchange_data.h @@ -14,8 +14,8 @@ #include <objidl.h> #endif -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/dragdrop/download_file_interface.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h index f9aec5b..327106f 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h @@ -8,6 +8,7 @@ #include <map> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/pickle.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/gfx/geometry/vector2d.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h index 2e43f06..2f590691 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_ #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_ +#include <stdint.h> #include <X11/Xlib.h> // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. @@ -13,6 +14,7 @@ #include <map> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/pickle.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/x/selection_owner.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.h b/ui/base/dragdrop/os_exchange_data_provider_mac.h index 57977ce..c619ab9 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_mac.h +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h @@ -6,6 +6,7 @@ #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_MAC_H_ #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ui/base/dragdrop/os_exchange_data.h" @class NSPasteboard; diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 3cd5b30..47f1e0b 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -4,12 +4,14 @@ #include "ui/base/dragdrop/os_exchange_data_provider_win.h" +#include <stdint.h> + #include <algorithm> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" +#include "base/macros.h" #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_hglobal.h" @@ -892,7 +894,7 @@ ULONG DataObjectImpl::Release() { static STGMEDIUM* GetStorageForBytes(const void* data, size_t bytes) { HANDLE handle = GlobalAlloc(GPTR, static_cast<int>(bytes)); if (handle) { - base::win::ScopedHGlobal<uint8*> scoped(handle); + base::win::ScopedHGlobal<uint8_t*> scoped(handle); memcpy(scoped.get(), data, bytes); } diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h index 9f638af..2825854 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.h +++ b/ui/base/dragdrop/os_exchange_data_provider_win.h @@ -7,6 +7,7 @@ #include <objidl.h> #include <shlobj.h> +#include <stddef.h> #include <string> #include <vector> @@ -18,6 +19,7 @@ #define IDataObjectAsyncCapability IAsyncOperation #endif +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/win/scoped_comptr.h" #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc index 96fe3d4..ca8e920 100644 --- a/ui/base/dragdrop/os_exchange_data_unittest.cc +++ b/ui/base/dragdrop/os_exchange_data_unittest.cc @@ -6,6 +6,7 @@ #include "base/message_loop/message_loop.h" #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "net/base/filename_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/ui/base/hit_test.h b/ui/base/hit_test.h index a91ce89..45ad59f 100644 --- a/ui/base/hit_test.h +++ b/ui/base/hit_test.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_HIT_TEST_H_ #define UI_BASE_HIT_TEST_H_ +#include "build/build_config.h" + #if !defined(OS_WIN) // Defines the same symbolic names used by the WM_NCHITTEST Notification under diff --git a/ui/base/idle/idle.h b/ui/base/idle/idle.h index 7ecdbff..9ea9f43 100644 --- a/ui/base/idle/idle.h +++ b/ui/base/idle/idle.h @@ -6,6 +6,7 @@ #define UI_BASE_IDLE_IDLE_H_ #include "base/callback.h" +#include "build/build_config.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/idle/idle_linux.cc b/ui/base/idle/idle_linux.cc index 622ae8d..a35aca7 100644 --- a/ui/base/idle/idle_linux.cc +++ b/ui/base/idle/idle_linux.cc @@ -4,7 +4,6 @@ #include "ui/base/idle/idle.h" -#include "base/basictypes.h" #if defined(USE_X11) #include "ui/base/idle/idle_query_x11.h" diff --git a/ui/base/idle/idle_query_x11.h b/ui/base/idle/idle_query_x11.h index 56588e6..e5f6b96 100644 --- a/ui/base/idle/idle_query_x11.h +++ b/ui/base/idle/idle_query_x11.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_IDLE_IDLE_QUERY_X11_H_ #define UI_BASE_IDLE_IDLE_QUERY_X11_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace ui { diff --git a/ui/base/idle/screensaver_window_finder_x11.cc b/ui/base/idle/screensaver_window_finder_x11.cc index b6e3be2..e5ddd30 100644 --- a/ui/base/idle/screensaver_window_finder_x11.cc +++ b/ui/base/idle/screensaver_window_finder_x11.cc @@ -4,7 +4,6 @@ #include "ui/base/idle/screensaver_window_finder_x11.h" -#include "base/basictypes.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/x/x11_error_tracker.h" diff --git a/ui/base/idle/screensaver_window_finder_x11.h b/ui/base/idle/screensaver_window_finder_x11.h index 1383b59..dad3d20 100644 --- a/ui/base/idle/screensaver_window_finder_x11.h +++ b/ui/base/idle/screensaver_window_finder_x11.h @@ -5,8 +5,8 @@ #ifndef UI_BASE_IDLE_SCREENSAVER_WINDOW_FINDER_X11_H_ #define UI_BASE_IDLE_SCREENSAVER_WINDOW_FINDER_X11_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/x/x11_util.h" namespace ui { diff --git a/ui/base/ime/candidate_window.cc b/ui/base/ime/candidate_window.cc index 6cb32e2..60f8c4d 100644 --- a/ui/base/ime/candidate_window.cc +++ b/ui/base/ime/candidate_window.cc @@ -4,6 +4,8 @@ #include "ui/base/ime/candidate_window.h" +#include <stddef.h> + #include <string> #include "base/logging.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/base/ime/candidate_window.h b/ui/base/ime/candidate_window.h index f8c967e..ad52c33 100644 --- a/ui/base/ime/candidate_window.h +++ b/ui/base/ime/candidate_window.h @@ -5,9 +5,12 @@ #ifndef UI_BASE_IME_CANDIDATE_WINDOW_H_ #define UI_BASE_IME_CANDIDATE_WINDOW_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ime/infolist_entry.h" #include "ui/base/ime/ui_base_ime_export.h" @@ -70,12 +73,12 @@ class UI_BASE_IME_EXPORT CandidateWindow { bool* has_highlighted) const; // Returns the number of candidates in one page. - uint32 page_size() const { return property_->page_size; } - void set_page_size(uint32 page_size) { property_->page_size = page_size; } + uint32_t page_size() const { return property_->page_size; } + void set_page_size(uint32_t page_size) { property_->page_size = page_size; } // Returns the cursor index of the currently selected candidate. - uint32 cursor_position() const { return property_->cursor_position; } - void set_cursor_position(uint32 cursor_position) { + uint32_t cursor_position() const { return property_->cursor_position; } + void set_cursor_position(uint32_t cursor_position) { property_->cursor_position = cursor_position; } diff --git a/ui/base/ime/candidate_window_unittest.cc b/ui/base/ime/candidate_window_unittest.cc index 4defe56..60022d2 100644 --- a/ui/base/ime/candidate_window_unittest.cc +++ b/ui/base/ime/candidate_window_unittest.cc @@ -5,6 +5,8 @@ #include "ui/base/ime/candidate_window.h" +#include <stddef.h> + #include <string> #include "base/compiler_specific.h" diff --git a/ui/base/ime/chromeos/character_composer.cc b/ui/base/ime/chromeos/character_composer.cc index cfb208e..481e170 100644 --- a/ui/base/ime/chromeos/character_composer.cc +++ b/ui/base/ime/chromeos/character_composer.cc @@ -21,7 +21,7 @@ namespace { bool CheckCharacterComposeTable( const ui::CharacterComposer::ComposeBuffer& compose_sequence, - uint32* composed_character) { + uint32_t* composed_character) { const ui::TreeComposeChecker kTreeComposeChecker(kCompositions); return kTreeComposeChecker.CheckSequence(compose_sequence, composed_character) != @@ -30,7 +30,7 @@ bool CheckCharacterComposeTable( // Converts |character| to UTF16 string. // Returns false when |character| is not a valid character. -bool UTF32CharacterToUTF16(uint32 character, base::string16* output) { +bool UTF32CharacterToUTF16(uint32_t character, base::string16* output) { output->clear(); // Reject invalid character. (e.g. codepoint greater than 0x10ffff) if (!CBU_IS_UNICODE_CHAR(character)) @@ -113,7 +113,7 @@ bool CharacterComposer::FilterKeyPressSequenceMode(const KeyEvent& event) { compose_buffer_.push_back(event.GetDomKey()); // Check compose table. - uint32 composed_character_utf32 = 0; + uint32_t composed_character_utf32 = 0; if (CheckCharacterComposeTable(compose_buffer_, &composed_character_utf32)) { // Key press is recognized as a part of composition. if (composed_character_utf32 != 0) { @@ -176,9 +176,9 @@ bool CharacterComposer::FilterKeyPressHexMode(const KeyEvent& event) { void CharacterComposer::CommitHex() { DCHECK(composition_mode_ == HEX_MODE); - uint32 composed_character_utf32 = 0; + uint32_t composed_character_utf32 = 0; for (size_t i = 0; i != hex_buffer_.size(); ++i) { - const uint32 digit = hex_buffer_[i]; + const uint32_t digit = hex_buffer_[i]; DCHECK(0 <= digit && digit < 16); composed_character_utf32 <<= 4; composed_character_utf32 |= digit; diff --git a/ui/base/ime/chromeos/character_composer.h b/ui/base/ime/chromeos/character_composer.h index 78fae69..d1befb6 100644 --- a/ui/base/ime/chromeos/character_composer.h +++ b/ui/base/ime/chromeos/character_composer.h @@ -5,8 +5,12 @@ #ifndef UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_ #define UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/strings/string_util.h" #include "ui/base/ime/ui_base_ime_export.h" #include "ui/events/keycodes/dom/dom_key.h" diff --git a/ui/base/ime/chromeos/character_composer_unittest.cc b/ui/base/ime/chromeos/character_composer_unittest.cc index 51b585f..235ad47 100644 --- a/ui/base/ime/chromeos/character_composer_unittest.cc +++ b/ui/base/ime/chromeos/character_composer_unittest.cc @@ -4,6 +4,9 @@ #include "ui/base/ime/chromeos/character_composer.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/ime/chromeos/component_extension_ime_manager.cc b/ui/base/ime/chromeos/component_extension_ime_manager.cc index 664f6e0..d630494 100644 --- a/ui/base/ime/chromeos/component_extension_ime_manager.cc +++ b/ui/base/ime/chromeos/component_extension_ime_manager.cc @@ -4,8 +4,11 @@ #include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "chromeos/chromeos_switches.h" #include "ui/base/ime/chromeos/extension_ime_util.h" diff --git a/ui/base/ime/chromeos/component_extension_ime_manager.h b/ui/base/ime/chromeos/component_extension_ime_manager.h index cdb9d757..33fe88e 100644 --- a/ui/base/ime/chromeos/component_extension_ime_manager.h +++ b/ui/base/ime/chromeos/component_extension_ime_manager.h @@ -9,6 +9,7 @@ #include <set> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "ui/base/ime/chromeos/input_method_descriptor.h" diff --git a/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc b/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc index 8ed1c31..e8f9014 100644 --- a/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc +++ b/ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/ime/chromeos/component_extension_ime_manager.h" #include "ui/base/ime/chromeos/extension_ime_util.h" diff --git a/ui/base/ime/chromeos/fake_ime_keyboard.h b/ui/base/ime/chromeos/fake_ime_keyboard.h index 02ba308..b11163d 100644 --- a/ui/base/ime/chromeos/fake_ime_keyboard.h +++ b/ui/base/ime/chromeos/fake_ime_keyboard.h @@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" namespace chromeos { namespace input_method { diff --git a/ui/base/ime/chromeos/fake_input_method_delegate.h b/ui/base/ime/chromeos/fake_input_method_delegate.h index b9b7aa1..51cf7a1 100644 --- a/ui/base/ime/chromeos/fake_input_method_delegate.h +++ b/ui/base/ime/chromeos/fake_input_method_delegate.h @@ -7,9 +7,9 @@ #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ime/chromeos/input_method_delegate.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/chromeos/ime_candidate_window_handler_interface.h b/ui/base/ime/chromeos/ime_candidate_window_handler_interface.h index f3c5058..3d4cb91 100644 --- a/ui/base/ime/chromeos/ime_candidate_window_handler_interface.h +++ b/ui/base/ime/chromeos/ime_candidate_window_handler_interface.h @@ -5,7 +5,8 @@ #ifndef UI_BASE_IME_CHROMEOS_IME_CNADIDATE_WINDOW_HANDLER_INTERFACE_H_ #define UI_BASE_IME_CHROMEOS_IME_CNADIDATE_WINDOW_HANDLER_INTERFACE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/strings/string16.h" #include "ui/base/ime/ui_base_ime_export.h" @@ -31,7 +32,7 @@ class UI_BASE_IME_EXPORT IMECandidateWindowHandlerInterface { // Called when the IME updates the preedit text. The |text| is given in // UTF-16 encoding. virtual void UpdatePreeditText(const base::string16& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) = 0; // Called when the application changes its caret bounds. diff --git a/ui/base/ime/chromeos/ime_keyboard.cc b/ui/base/ime/chromeos/ime_keyboard.cc index 200d0ca..581a3c5 100644 --- a/ui/base/ime/chromeos/ime_keyboard.cc +++ b/ui/base/ime/chromeos/ime_keyboard.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "ui/base/ime/chromeos/ime_keyboard.h" namespace chromeos { diff --git a/ui/base/ime/chromeos/ime_keyboard.h b/ui/base/ime/chromeos/ime_keyboard.h index 44f7d35..5b24bc6 100644 --- a/ui/base/ime/chromeos/ime_keyboard.h +++ b/ui/base/ime/chromeos/ime_keyboard.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/observer_list.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/chromeos/ime_keyboard_ozone.h b/ui/base/ime/chromeos/ime_keyboard_ozone.h index e9813c7..d42791a 100644 --- a/ui/base/ime/chromeos/ime_keyboard_ozone.h +++ b/ui/base/ime/chromeos/ime_keyboard_ozone.h @@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ime/ui_base_ime_export.h" namespace ui { diff --git a/ui/base/ime/chromeos/ime_keyboard_x11.cc b/ui/base/ime/chromeos/ime_keyboard_x11.cc index 55be02c..e25e3da 100644 --- a/ui/base/ime/chromeos/ime_keyboard_x11.cc +++ b/ui/base/ime/chromeos/ime_keyboard_x11.cc @@ -4,6 +4,7 @@ #include "ui/base/ime/chromeos/ime_keyboard_x11.h" +#include <stddef.h> #include <X11/XKBlib.h> #include <X11/Xlib.h> diff --git a/ui/base/ime/chromeos/ime_keyboard_x11.h b/ui/base/ime/chromeos/ime_keyboard_x11.h index 6b9da52..efc6b86 100644 --- a/ui/base/ime/chromeos/ime_keyboard_x11.h +++ b/ui/base/ime/chromeos/ime_keyboard_x11.h @@ -15,6 +15,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/process/kill.h" diff --git a/ui/base/ime/chromeos/ime_keymap.cc b/ui/base/ime/chromeos/ime_keymap.cc index d214321..e1433ce 100644 --- a/ui/base/ime/chromeos/ime_keymap.cc +++ b/ui/base/ime/chromeos/ime_keymap.cc @@ -4,9 +4,12 @@ #include "ui/base/ime/chromeos/ime_keymap.h" +#include <stddef.h> + #include <map> #include "base/lazy_instance.h" +#include "base/macros.h" namespace ui { diff --git a/ui/base/ime/chromeos/ime_keymap.h b/ui/base/ime/chromeos/ime_keymap.h index 4a87a6a..2f8d012 100644 --- a/ui/base/ime/chromeos/ime_keymap.h +++ b/ui/base/ime/chromeos/ime_keymap.h @@ -6,7 +6,6 @@ #define UI_BASE_IME_CHROMEOS_IME_KEYMAP_H_ #include <string> -#include "base/basictypes.h" #include "ui/base/ime/ui_base_ime_export.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/ui/base/ime/chromeos/input_method_delegate.h b/ui/base/ime/chromeos/input_method_delegate.h index 45b19cf..47aa251 100644 --- a/ui/base/ime/chromeos/input_method_delegate.h +++ b/ui/base/ime/chromeos/input_method_delegate.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace chromeos { diff --git a/ui/base/ime/chromeos/input_method_descriptor.h b/ui/base/ime/chromeos/input_method_descriptor.h index 188e370..461b37c 100644 --- a/ui/base/ime/chromeos/input_method_descriptor.h +++ b/ui/base/ime/chromeos/input_method_descriptor.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "ui/base/ime/ui_base_ime_export.h" #include "url/gurl.h" diff --git a/ui/base/ime/chromeos/input_method_manager.h b/ui/base/ime/chromeos/input_method_manager.h index 2f992ce..2f70123 100644 --- a/ui/base/ime/chromeos/input_method_manager.h +++ b/ui/base/ime/chromeos/input_method_manager.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_IME_CHROMEOS_INPUT_METHOD_MANAGER_H_ #define UI_BASE_IME_CHROMEOS_INPUT_METHOD_MANAGER_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> diff --git a/ui/base/ime/chromeos/input_method_whitelist.cc b/ui/base/ime/chromeos/input_method_whitelist.cc index 8086ef9..ff7bb86c 100644 --- a/ui/base/ime/chromeos/input_method_whitelist.cc +++ b/ui/base/ime/chromeos/input_method_whitelist.cc @@ -4,8 +4,11 @@ #include "ui/base/ime/chromeos/input_method_whitelist.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "chromeos/ime/input_methods.h" diff --git a/ui/base/ime/chromeos/input_method_whitelist.h b/ui/base/ime/chromeos/input_method_whitelist.h index 1da5fc1..59154dd 100644 --- a/ui/base/ime/chromeos/input_method_whitelist.h +++ b/ui/base/ime/chromeos/input_method_whitelist.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h b/ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h index 5bc4822..a237d8b 100644 --- a/ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h +++ b/ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_CHROMEOS_MOCK_COMPONENT_EXTENSION_IME_MANAGER_DELEGATE_H_ #define UI_BASE_IME_CHROMEOS_MOCK_COMPONENT_EXTENSION_IME_MANAGER_DELEGATE_H_ +#include "base/macros.h" #include "ui/base/ime/chromeos/component_extension_ime_manager.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc index 6e61876..9ea728c 100644 --- a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc +++ b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc @@ -25,7 +25,7 @@ void MockIMECandidateWindowHandler::UpdateLookupTable( void MockIMECandidateWindowHandler::UpdatePreeditText( const base::string16& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) {} void MockIMECandidateWindowHandler::SetCursorBounds( diff --git a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h index d24124f..8250848 100644 --- a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h +++ b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_IME_CHROMEOS_MOCK_IME_CANDIDATE_WINDOW_HANDLER_H_ #define UI_BASE_IME_CHROMEOS_MOCK_IME_CANDIDATE_WINDOW_HANDLER_H_ +#include <stdint.h> + #include "ui/base/ime/candidate_window.h" #include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h" #include "ui/base/ime/ui_base_ime_export.h" @@ -31,7 +33,7 @@ class UI_BASE_IME_EXPORT MockIMECandidateWindowHandler void UpdateLookupTable(const ui::CandidateWindow& candidate_window, bool visible) override; void UpdatePreeditText(const base::string16& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) override; void SetCursorBounds(const gfx::Rect& cursor_bounds, const gfx::Rect& composition_head) override; diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.cc b/ui/base/ime/chromeos/mock_ime_engine_handler.cc index 49dd4d4..3216518 100644 --- a/ui/base/ime/chromeos/mock_ime_engine_handler.cc +++ b/ui/base/ime/chromeos/mock_ime_engine_handler.cc @@ -60,13 +60,12 @@ void MockIMEEngineHandler::ProcessKeyEvent(const ui::KeyEvent& key_event, last_passed_callback_ = callback; } -void MockIMEEngineHandler::CandidateClicked(uint32 index) { -} +void MockIMEEngineHandler::CandidateClicked(uint32_t index) {} void MockIMEEngineHandler::SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) { + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) { ++set_surrounding_text_call_count_; last_set_surrounding_text_ = text; last_set_surrounding_cursor_pos_ = cursor_pos; diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.h b/ui/base/ime/chromeos/mock_ime_engine_handler.h index d212fc5..053e8c1 100644 --- a/ui/base/ime/chromeos/mock_ime_engine_handler.h +++ b/ui/base/ime/chromeos/mock_ime_engine_handler.h @@ -5,6 +5,9 @@ #ifndef UI_BASE_IME_CHROMEOS_MOCK_IME_ENGINE_HANDLER_H_ #define UI_BASE_IME_CHROMEOS_MOCK_IME_ENGINE_HANDLER_H_ +#include <stddef.h> +#include <stdint.h> + #include "ui/base/ime/ime_engine_handler_interface.h" #include "ui/base/ime/ui_base_ime_export.h" #include "ui/events/event.h" @@ -26,11 +29,11 @@ class UI_BASE_IME_EXPORT MockIMEEngineHandler bool IsInterestedInKeyEvent() const override; void ProcessKeyEvent(const ui::KeyEvent& key_event, KeyEventDoneCallback& callback) override; - void CandidateClicked(uint32 index) override; + void CandidateClicked(uint32_t index) override; void SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) override; + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) override; void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) override; int focus_in_call_count() const { return focus_in_call_count_; } @@ -55,11 +58,11 @@ class UI_BASE_IME_EXPORT MockIMEEngineHandler return last_set_surrounding_text_; } - uint32 last_set_surrounding_cursor_pos() const { + uint32_t last_set_surrounding_cursor_pos() const { return last_set_surrounding_cursor_pos_; } - uint32 last_set_surrounding_anchor_pos() const { + uint32_t last_set_surrounding_anchor_pos() const { return last_set_surrounding_anchor_pos_; } @@ -127,8 +130,8 @@ class UI_BASE_IME_EXPORT MockIMEEngineHandler InputContext last_text_input_context_; std::string last_activated_property_; std::string last_set_surrounding_text_; - uint32 last_set_surrounding_cursor_pos_; - uint32 last_set_surrounding_anchor_pos_; + uint32_t last_set_surrounding_cursor_pos_; + uint32_t last_set_surrounding_anchor_pos_; scoped_ptr<ui::KeyEvent> last_processed_key_event_; KeyEventDoneCallback last_passed_callback_; std::string active_component_id_; diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.cc b/ui/base/ime/chromeos/mock_ime_input_context_handler.cc index c139e70..e4decfd 100644 --- a/ui/base/ime/chromeos/mock_ime_input_context_handler.cc +++ b/ui/base/ime/chromeos/mock_ime_input_context_handler.cc @@ -24,7 +24,7 @@ void MockIMEInputContextHandler::CommitText(const std::string& text) { void MockIMEInputContextHandler::UpdateCompositionText( const ui::CompositionText& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) { ++update_preedit_text_call_count_; last_update_composition_arg_.composition_text.CopyFrom(text); @@ -32,8 +32,8 @@ void MockIMEInputContextHandler::UpdateCompositionText( last_update_composition_arg_.is_visible = visible; } -void MockIMEInputContextHandler::DeleteSurroundingText(int32 offset, - uint32 length) { +void MockIMEInputContextHandler::DeleteSurroundingText(int32_t offset, + uint32_t length) { ++delete_surrounding_text_call_count_; last_delete_surrounding_text_arg_.offset = offset; last_delete_surrounding_text_arg_.length = length; diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.h b/ui/base/ime/chromeos/mock_ime_input_context_handler.h index 21fa313..78dec902 100644 --- a/ui/base/ime/chromeos/mock_ime_input_context_handler.h +++ b/ui/base/ime/chromeos/mock_ime_input_context_handler.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_ #define UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_ +#include <stdint.h> + #include "ui/base/ime/composition_text.h" #include "ui/base/ime/ime_input_context_handler_interface.h" #include "ui/base/ime/ui_base_ime_export.h" @@ -16,13 +18,13 @@ class UI_BASE_IME_EXPORT MockIMEInputContextHandler public: struct UpdateCompositionTextArg { ui::CompositionText composition_text; - uint32 cursor_pos; + uint32_t cursor_pos; bool is_visible; }; struct DeleteSurroundingTextArg { - int32 offset; - uint32 length; + int32_t offset; + uint32_t length; }; MockIMEInputContextHandler(); @@ -30,9 +32,9 @@ class UI_BASE_IME_EXPORT MockIMEInputContextHandler void CommitText(const std::string& text) override; void UpdateCompositionText(const ui::CompositionText& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) override; - void DeleteSurroundingText(int32 offset, uint32 length) override; + void DeleteSurroundingText(int32_t offset, uint32_t length) override; int commit_text_call_count() const { return commit_text_call_count_; } diff --git a/ui/base/ime/composition_text.h b/ui/base/ime/composition_text.h index f5b1e37..9b729b5 100644 --- a/ui/base/ime/composition_text.h +++ b/ui/base/ime/composition_text.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_IME_COMPOSITION_TEXT_H_ #define UI_BASE_IME_COMPOSITION_TEXT_H_ +#include <stddef.h> + #include "base/strings/string16.h" #include "ui/base/ime/composition_underline.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/composition_text_unittest.cc b/ui/base/ime/composition_text_unittest.cc index d7ed2b8..c03090a5 100644 --- a/ui/base/ime/composition_text_unittest.cc +++ b/ui/base/ime/composition_text_unittest.cc @@ -4,6 +4,8 @@ #include "ui/base/ime/composition_text.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/ime/composition_text_util_pango.cc b/ui/base/ime/composition_text_util_pango.cc index 325cdd6..b8a9297 100644 --- a/ui/base/ime/composition_text_util_pango.cc +++ b/ui/base/ime/composition_text_util_pango.cc @@ -5,8 +5,8 @@ #include "ui/base/ime/composition_text_util_pango.h" #include <pango/pango-attributes.h> +#include <stddef.h> -#include "base/basictypes.h" #include "base/i18n/char_iterator.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/base/ime/composition_text_util_pango_unittest.cc b/ui/base/ime/composition_text_util_pango_unittest.cc index a2056cf..c645e30 100644 --- a/ui/base/ime/composition_text_util_pango_unittest.cc +++ b/ui/base/ime/composition_text_util_pango_unittest.cc @@ -5,12 +5,14 @@ #include "ui/base/ime/composition_text_util_pango.h" #include <pango/pango-attributes.h> +#include <stddef.h> +#include <stdint.h> #include <string> #include <utility> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/ime/composition_text.h" @@ -26,9 +28,9 @@ struct AttributeInfo { struct Underline { unsigned start_offset; unsigned end_offset; - uint32 color; + uint32_t color; bool thick; - uint32 background_color; + uint32_t background_color; }; struct TestData { diff --git a/ui/base/ime/composition_underline.h b/ui/base/ime/composition_underline.h index a8c44b6..f817069 100644 --- a/ui/base/ime/composition_underline.h +++ b/ui/base/ime/composition_underline.h @@ -5,9 +5,10 @@ #ifndef UI_BASE_IME_COMPOSITION_UNDERLINE_H_ #define UI_BASE_IME_COMPOSITION_UNDERLINE_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" namespace ui { @@ -23,14 +24,14 @@ struct CompositionUnderline { background_color(SK_ColorTRANSPARENT) {} // TODO(huangs): remove this constructor. - CompositionUnderline(uint32 s, uint32 e, SkColor c, bool t) + CompositionUnderline(uint32_t s, uint32_t e, SkColor c, bool t) : start_offset(s), end_offset(e), color(c), thick(t), background_color(SK_ColorTRANSPARENT) {} - CompositionUnderline(uint32 s, uint32 e, SkColor c, bool t, SkColor bc) + CompositionUnderline(uint32_t s, uint32_t e, SkColor c, bool t, SkColor bc) : start_offset(s), end_offset(e), color(c), @@ -48,8 +49,8 @@ struct CompositionUnderline { return !(*this == rhs); } - uint32 start_offset; - uint32 end_offset; + uint32_t start_offset; + uint32_t end_offset; SkColor color; bool thick; SkColor background_color; diff --git a/ui/base/ime/dummy_input_method.h b/ui/base/ime/dummy_input_method.h index 636c8bb..26e888a 100644 --- a/ui/base/ime/dummy_input_method.h +++ b/ui/base/ime/dummy_input_method.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_DUMMY_INPUT_METHOD_H_ #define UI_BASE_IME_DUMMY_INPUT_METHOD_H_ +#include "base/macros.h" #include "ui/base/ime/input_method.h" namespace ui { diff --git a/ui/base/ime/dummy_text_input_client.cc b/ui/base/ime/dummy_text_input_client.cc index dcc8fb4..478b489 100644 --- a/ui/base/ime/dummy_text_input_client.cc +++ b/ui/base/ime/dummy_text_input_client.cc @@ -52,7 +52,7 @@ gfx::Rect DummyTextInputClient::GetCaretBounds() const { } bool DummyTextInputClient::GetCompositionCharacterBounds( - uint32 index, + uint32_t index, gfx::Rect* rect) const { return false; } diff --git a/ui/base/ime/dummy_text_input_client.h b/ui/base/ime/dummy_text_input_client.h index 7f5f7f3..3c51782 100644 --- a/ui/base/ime/dummy_text_input_client.h +++ b/ui/base/ime/dummy_text_input_client.h @@ -5,6 +5,10 @@ #ifndef UI_BASE_IME_DUMMY_TEXT_INPUT_CLIENT_H_ #define UI_BASE_IME_DUMMY_TEXT_INPUT_CLIENT_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "ui/base/ime/text_input_client.h" namespace ui { @@ -27,7 +31,7 @@ class DummyTextInputClient : public TextInputClient { 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; diff --git a/ui/base/ime/ime_bridge.cc b/ui/base/ime/ime_bridge.cc index 2dd3a5a..7b4e8e2 100644 --- a/ui/base/ime/ime_bridge.cc +++ b/ui/base/ime/ime_bridge.cc @@ -5,8 +5,11 @@ #include "ui/base/ime/ime_bridge.h" #include <map> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/singleton.h" +#include "build/build_config.h" namespace ui { diff --git a/ui/base/ime/ime_bridge.h b/ui/base/ime/ime_bridge.h index e21cdaf..5db8bba 100644 --- a/ui/base/ime/ime_bridge.h +++ b/ui/base/ime/ime_bridge.h @@ -6,6 +6,7 @@ #define UI_BASE_IME_IME_BRIDGE_H_ #include "base/macros.h" +#include "build/build_config.h" #include "ui/base/ime/ime_engine_handler_interface.h" #include "ui/base/ime/ime_input_context_handler_interface.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/ime_engine_handler_interface.cc b/ui/base/ime/ime_engine_handler_interface.cc index ac45526..695a547 100644 --- a/ui/base/ime/ime_engine_handler_interface.cc +++ b/ui/base/ime/ime_engine_handler_interface.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "ui/base/ime/ime_engine_handler_interface.h" namespace ui { diff --git a/ui/base/ime/ime_engine_handler_interface.h b/ui/base/ime/ime_engine_handler_interface.h index 9a27873..27e265a 100644 --- a/ui/base/ime/ime_engine_handler_interface.h +++ b/ui/base/ime/ime_engine_handler_interface.h @@ -5,10 +5,14 @@ #ifndef UI_BASE_IME_IME_ENGINE_HANDLER_INTERFACE_H_ #define UI_BASE_IME_IME_ENGINE_HANDLER_INTERFACE_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" + #include "base/callback.h" +#include "build/build_config.h" #include "ui/base/ime/text_input_mode.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/ime/ui_base_ime_export.h" @@ -108,9 +112,9 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { // Otherwise |anchor_pos| is equal to |cursor_pos|. If not all surrounding // text is given |offset_pos| indicates the starting offset of |text|. virtual void SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) = 0; + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) = 0; // Called when the composition bounds changed. virtual void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) = 0; @@ -231,7 +235,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { // Called when the candidate in lookup table is clicked. The |index| is 0 // based candidate index in lookup table. - virtual void CandidateClicked(uint32 index) = 0; + virtual void CandidateClicked(uint32_t index) = 0; // This function returns the current property of the candidate window. // The caller can use the returned value as the default property and diff --git a/ui/base/ime/ime_engine_observer.h b/ui/base/ime/ime_engine_observer.h index 39ded6c..3bdcab1 100644 --- a/ui/base/ime/ime_engine_observer.h +++ b/ui/base/ime/ime_engine_observer.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_IME_ENGINE_OBSERVER_H_ #define UI_BASE_IME_IME_ENGINE_OBSERVER_H_ +#include "build/build_config.h" #include "ui/base/ime/ime_engine_handler_interface.h" namespace ui { diff --git a/ui/base/ime/ime_input_context_handler_interface.h b/ui/base/ime/ime_input_context_handler_interface.h index f5520f5..5a8f6ae 100644 --- a/ui/base/ime/ime_input_context_handler_interface.h +++ b/ui/base/ime/ime_input_context_handler_interface.h @@ -5,8 +5,9 @@ #ifndef UI_BASE_IME_IME_INPUT_CONTEXT_HANDLER_INTERFACE_H_ #define UI_BASE_IME_IME_INPUT_CONTEXT_HANDLER_INTERFACE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/ui_base_ime_export.h" @@ -19,11 +20,11 @@ class UI_BASE_IME_EXPORT IMEInputContextHandlerInterface { // Called when the engine updates composition text. virtual void UpdateCompositionText(const CompositionText& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) = 0; // Called when the engine request deleting surrounding string. - virtual void DeleteSurroundingText(int32 offset, uint32 length) = 0; + virtual void DeleteSurroundingText(int32_t offset, uint32_t length) = 0; }; } // namespace ui diff --git a/ui/base/ime/input_method.h b/ui/base/ime/input_method.h index 21b0235..598fd4f 100644 --- a/ui/base/ime/input_method.h +++ b/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() {} diff --git a/ui/base/ime/input_method_auralinux.h b/ui/base/ime/input_method_auralinux.h index 05a80d7..29b76fd 100644 --- a/ui/base/ime/input_method_auralinux.h +++ b/ui/base/ime/input_method_auralinux.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_INPUT_METHOD_AURALINUX_H_ #define UI_BASE_IME_INPUT_METHOD_AURALINUX_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/input_method_base.h" diff --git a/ui/base/ime/input_method_auralinux_unittest.cc b/ui/base/ime/input_method_auralinux_unittest.cc index ba71341..7ed2d49 100644 --- a/ui/base/ime/input_method_auralinux_unittest.cc +++ b/ui/base/ime/input_method_auralinux_unittest.cc @@ -4,6 +4,9 @@ #include "ui/base/ime/input_method_auralinux.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h index 3456839..e9efb3a 100644 --- a/ui/base/ime/input_method_base.h +++ b/ui/base/ime/input_method_base.h @@ -5,8 +5,8 @@ #ifndef UI_BASE_IME_INPUT_METHOD_BASE_H_ #define UI_BASE_IME_INPUT_METHOD_BASE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "ui/base/ime/input_method.h" diff --git a/ui/base/ime/input_method_base_unittest.cc b/ui/base/ime/input_method_base_unittest.cc index 0b619c2..175f998 100644 --- a/ui/base/ime/input_method_base_unittest.cc +++ b/ui/base/ime/input_method_base_unittest.cc @@ -5,6 +5,7 @@ #include "ui/base/ime/input_method_base.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/ui/base/ime/input_method_chromeos.cc b/ui/base/ime/input_method_chromeos.cc index fc5b3a1..8bf4014 100644 --- a/ui/base/ime/input_method_chromeos.cc +++ b/ui/base/ime/input_method_chromeos.cc @@ -4,12 +4,13 @@ #include "ui/base/ime/input_method_chromeos.h" +#include <stddef.h> + #include <algorithm> #include <cstring> #include <set> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/i18n/char_iterator.h" #include "base/logging.h" @@ -187,7 +188,7 @@ void InputMethodChromeOS::OnCaretBoundsChanged(const TextInputClient* client) { gfx::Rect composition_head; std::vector<gfx::Rect> rects; if (client->HasCompositionText()) { - uint32 i = 0; + uint32_t i = 0; gfx::Rect rect; while (client->GetCompositionCharacterBounds(i++, &rect)) rects.push_back(rect); @@ -414,7 +415,7 @@ void InputMethodChromeOS::ProcessUnfilteredKeyPressEvent( // If a key event was not filtered by |context_| and |character_composer_|, // then it means the key event didn't generate any result text. So we need // to send corresponding character to the focused text input client. - uint16 ch = event->GetCharacter(); + uint16_t ch = event->GetCharacter(); if (ch) client->InsertChar(*event); } @@ -500,7 +501,7 @@ void InputMethodChromeOS::CommitText(const std::string& text) { } void InputMethodChromeOS::UpdateCompositionText(const CompositionText& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) { if (IsTextInputTypeNone()) return; @@ -562,12 +563,13 @@ void InputMethodChromeOS::HidePreeditText() { } } -void InputMethodChromeOS::DeleteSurroundingText(int32 offset, uint32 length) { +void InputMethodChromeOS::DeleteSurroundingText(int32_t offset, + uint32_t length) { if (!composition_.text.empty()) return; // do nothing if there is ongoing composition. if (GetTextInputClient()) { - uint32 before = offset >= 0 ? 0U : static_cast<uint32>(-1 * offset); + uint32_t before = offset >= 0 ? 0U : static_cast<uint32_t>(-1 * offset); GetTextInputClient()->ExtendSelectionAndDelete(before, length - before); } } @@ -590,7 +592,7 @@ bool InputMethodChromeOS::ExecuteCharacterComposer(const ui::KeyEvent& event) { void InputMethodChromeOS::ExtractCompositionText( const CompositionText& text, - uint32 cursor_position, + uint32_t cursor_position, CompositionText* out_composition) const { out_composition->Clear(); out_composition->text = text.text; @@ -608,7 +610,7 @@ void InputMethodChromeOS::ExtractCompositionText( } while (char_iterator.Advance()); // The text length in Unicode characters. - uint32 char_length = static_cast<uint32>(char16_offsets.size()); + uint32_t char_length = static_cast<uint32_t>(char16_offsets.size()); // Make sure we can convert the value of |char_length| as well. char16_offsets.push_back(length); @@ -620,8 +622,8 @@ void InputMethodChromeOS::ExtractCompositionText( const CompositionUnderlines text_underlines = text.underlines; if (!text_underlines.empty()) { for (size_t i = 0; i < text_underlines.size(); ++i) { - const uint32 start = text_underlines[i].start_offset; - const uint32 end = text_underlines[i].end_offset; + const uint32_t start = text_underlines[i].start_offset; + const uint32_t end = text_underlines[i].end_offset; if (start >= end) continue; CompositionUnderline underline( @@ -633,8 +635,8 @@ void InputMethodChromeOS::ExtractCompositionText( DCHECK(text.selection.start() <= text.selection.end()); if (text.selection.start() < text.selection.end()) { - const uint32 start = text.selection.start(); - const uint32 end = text.selection.end(); + const uint32_t start = text.selection.start(); + const uint32_t end = text.selection.end(); CompositionUnderline underline(char16_offsets[start], char16_offsets[end], SK_ColorBLACK, diff --git a/ui/base/ime/input_method_chromeos.h b/ui/base/ime/input_method_chromeos.h index 13cbdf9..28da9b7 100644 --- a/ui/base/ime/input_method_chromeos.h +++ b/ui/base/ime/input_method_chromeos.h @@ -5,11 +5,13 @@ #ifndef UI_BASE_IME_INPUT_METHOD_CHROMEOS_H_ #define UI_BASE_IME_INPUT_METHOD_CHROMEOS_H_ +#include <stdint.h> + #include <set> #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 "ui/base/ime/chromeos/character_composer.h" @@ -43,7 +45,7 @@ class UI_BASE_IME_EXPORT InputMethodChromeOS protected: // Converts |text| into CompositionText. void ExtractCompositionText(const CompositionText& text, - uint32 cursor_position, + uint32_t cursor_position, CompositionText* out_composition) const; // Process a key returned from the input method. @@ -100,9 +102,9 @@ class UI_BASE_IME_EXPORT InputMethodChromeOS // ui::IMEInputContextHandlerInterface overrides: void CommitText(const std::string& text) override; void UpdateCompositionText(const CompositionText& text, - uint32 cursor_pos, + uint32_t cursor_pos, bool visible) override; - void DeleteSurroundingText(int32 offset, uint32 length) override; + void DeleteSurroundingText(int32_t offset, uint32_t length) override; // Hides the composition text. void HidePreeditText(); diff --git a/ui/base/ime/input_method_chromeos_unittest.cc b/ui/base/ime/input_method_chromeos_unittest.cc index b35a083..40677ea 100644 --- a/ui/base/ime/input_method_chromeos_unittest.cc +++ b/ui/base/ime/input_method_chromeos_unittest.cc @@ -4,6 +4,8 @@ #include "ui/base/ime/input_method_chromeos.h" +#include <stddef.h> +#include <stdint.h> #include <X11/Xlib.h> #undef Bool #undef FocusIn @@ -13,6 +15,7 @@ #include <cstring> #include "base/i18n/char_iterator.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -42,8 +45,8 @@ const base::string16 kSampleText = base::UTF8ToUTF16( typedef IMEEngineHandlerInterface::KeyEventDoneCallback KeyEventCallback; -uint32 GetOffsetInUTF16( - const base::string16& utf16_string, uint32 utf8_offset) { +uint32_t GetOffsetInUTF16(const base::string16& utf16_string, + uint32_t utf8_offset) { DCHECK_LT(utf8_offset, utf16_string.size()); base::i18n::UTF16CharIterator char_iterator(&utf16_string); for (size_t i = 0; i < utf8_offset; ++i) @@ -104,9 +107,9 @@ class TestableInputMethodChromeOS : public InputMethodChromeOS { class SynchronousKeyEventHandler { public: - SynchronousKeyEventHandler(uint32 expected_keyval, - uint32 expected_keycode, - uint32 expected_state, + SynchronousKeyEventHandler(uint32_t expected_keyval, + uint32_t expected_keycode, + uint32_t expected_state, KeyEventHandlerBehavior behavior) : expected_keyval_(expected_keyval), expected_keycode_(expected_keycode), @@ -115,9 +118,9 @@ class SynchronousKeyEventHandler { virtual ~SynchronousKeyEventHandler() {} - void Run(uint32 keyval, - uint32 keycode, - uint32 state, + void Run(uint32_t keyval, + uint32_t keycode, + uint32_t state, const KeyEventCallback& callback) { EXPECT_EQ(expected_keyval_, keyval); EXPECT_EQ(expected_keycode_, keycode); @@ -126,9 +129,9 @@ class SynchronousKeyEventHandler { } private: - const uint32 expected_keyval_; - const uint32 expected_keycode_; - const uint32 expected_state_; + const uint32_t expected_keyval_; + const uint32_t expected_keycode_; + const uint32_t expected_state_; const KeyEventHandlerBehavior behavior_; DISALLOW_COPY_AND_ASSIGN(SynchronousKeyEventHandler); @@ -136,18 +139,18 @@ class SynchronousKeyEventHandler { class AsynchronousKeyEventHandler { public: - AsynchronousKeyEventHandler(uint32 expected_keyval, - uint32 expected_keycode, - uint32 expected_state) + AsynchronousKeyEventHandler(uint32_t expected_keyval, + uint32_t expected_keycode, + uint32_t expected_state) : expected_keyval_(expected_keyval), expected_keycode_(expected_keycode), expected_state_(expected_state) {} virtual ~AsynchronousKeyEventHandler() {} - void Run(uint32 keyval, - uint32 keycode, - uint32 state, + void Run(uint32_t keyval, + uint32_t keycode, + uint32_t state, const KeyEventCallback& callback) { EXPECT_EQ(expected_keyval_, keyval); EXPECT_EQ(expected_keycode_, keycode); @@ -160,9 +163,9 @@ class AsynchronousKeyEventHandler { } private: - const uint32 expected_keyval_; - const uint32 expected_keycode_; - const uint32 expected_state_; + const uint32_t expected_keyval_; + const uint32_t expected_keycode_; + const uint32_t expected_state_; KeyEventCallback callback_; DISALLOW_COPY_AND_ASSIGN(AsynchronousKeyEventHandler); @@ -171,15 +174,15 @@ class AsynchronousKeyEventHandler { class SetSurroundingTextVerifier { public: SetSurroundingTextVerifier(const std::string& expected_surrounding_text, - uint32 expected_cursor_position, - uint32 expected_anchor_position) + uint32_t expected_cursor_position, + uint32_t expected_anchor_position) : expected_surrounding_text_(expected_surrounding_text), expected_cursor_position_(expected_cursor_position), expected_anchor_position_(expected_anchor_position) {} void Verify(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos) { + uint32_t cursor_pos, + uint32_t anchor_pos) { EXPECT_EQ(expected_surrounding_text_, text); EXPECT_EQ(expected_cursor_position_, cursor_pos); EXPECT_EQ(expected_anchor_position_, anchor_pos); @@ -187,8 +190,8 @@ class SetSurroundingTextVerifier { private: const std::string expected_surrounding_text_; - const uint32 expected_cursor_position_; - const uint32 expected_anchor_position_; + const uint32_t expected_cursor_position_; + const uint32_t expected_anchor_position_; DISALLOW_COPY_AND_ASSIGN(SetSurroundingTextVerifier); }; @@ -551,7 +554,7 @@ TEST_F(InputMethodChromeOSTest, OnCaretBoundsChanged) { TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_NoAttribute) { const base::string16 kSampleAsciiText = UTF8ToUTF16("Sample Text"); - const uint32 kCursorPos = 2UL; + const uint32_t kCursorPos = 2UL; CompositionText chromeos_composition_text; chromeos_composition_text.text = kSampleAsciiText; @@ -572,7 +575,7 @@ TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_NoAttribute) { } TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_SingleUnderline) { - const uint32 kCursorPos = 2UL; + const uint32_t kCursorPos = 2UL; // Set up chromeos composition text with one underline attribute. CompositionText composition_text; @@ -601,7 +604,7 @@ TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_SingleUnderline) { } TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_DoubleUnderline) { - const uint32 kCursorPos = 2UL; + const uint32_t kCursorPos = 2UL; // Set up chromeos composition text with one underline attribute. CompositionText composition_text; @@ -630,7 +633,7 @@ TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_DoubleUnderline) { } TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_ErrorUnderline) { - const uint32 kCursorPos = 2UL; + const uint32_t kCursorPos = 2UL; // Set up chromeos composition text with one underline attribute. CompositionText composition_text; @@ -656,7 +659,7 @@ TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_ErrorUnderline) { } TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_Selection) { - const uint32 kCursorPos = 2UL; + const uint32_t kCursorPos = 2UL; // Set up chromeos composition text with one underline attribute. CompositionText composition_text; @@ -683,7 +686,7 @@ TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_Selection) { TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_SelectionStartWithCursor) { - const uint32 kCursorPos = 1UL; + const uint32_t kCursorPos = 1UL; // Set up chromeos composition text with one underline attribute. CompositionText composition_text; @@ -714,7 +717,7 @@ TEST_F(InputMethodChromeOSTest, TEST_F(InputMethodChromeOSTest, ExtractCompositionTextTest_SelectionEndWithCursor) { - const uint32 kCursorPos = 4UL; + const uint32_t kCursorPos = 4UL; // Set up chromeos composition text with one underline attribute. CompositionText composition_text; diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc index 12e38ea..d20f5f4 100644 --- a/ui/base/ime/input_method_factory.cc +++ b/ui/base/ime/input_method_factory.cc @@ -4,6 +4,7 @@ #include "ui/base/ime/input_method_factory.h" +#include "build/build_config.h" #include "ui/base/ime/mock_input_method.h" #if defined(OS_CHROMEOS) diff --git a/ui/base/ime/input_method_factory.h b/ui/base/ime/input_method_factory.h index 30132cb..3de9c5c 100644 --- a/ui/base/ime/input_method_factory.h +++ b/ui/base/ime/input_method_factory.h @@ -5,7 +5,6 @@ #ifndef UI_BASE_IME_INPUT_METHOD_FACTORY_H_ #define UI_BASE_IME_INPUT_METHOD_FACTORY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ime/input_method_initializer.h" diff --git a/ui/base/ime/input_method_initializer.cc b/ui/base/ime/input_method_initializer.cc index 5ef0dc9..1ac3c27 100644 --- a/ui/base/ime/input_method_initializer.cc +++ b/ui/base/ime/input_method_initializer.cc @@ -4,6 +4,8 @@ #include "ui/base/ime/input_method_initializer.h" +#include "build/build_config.h" + #if defined(OS_CHROMEOS) #include "ui/base/ime/ime_bridge.h" #elif defined(USE_AURA) && defined(OS_LINUX) diff --git a/ui/base/ime/input_method_initializer.h b/ui/base/ime/input_method_initializer.h index 787d7cc..588d7f1 100644 --- a/ui/base/ime/input_method_initializer.h +++ b/ui/base/ime/input_method_initializer.h @@ -5,7 +5,6 @@ #ifndef UI_BASE_IME_INPUT_METHOD_INITIALIZER_H_ #define UI_BASE_IME_INPUT_METHOD_INITIALIZER_H_ -#include "base/basictypes.h" #include "ui/base/ime/ui_base_ime_export.h" namespace ui { diff --git a/ui/base/ime/input_method_mac.h b/ui/base/ime/input_method_mac.h index e14925c..a792400 100644 --- a/ui/base/ime/input_method_mac.h +++ b/ui/base/ime/input_method_mac.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_INPUT_METHOD_MAC_H_ #define UI_BASE_IME_INPUT_METHOD_MAC_H_ +#include "base/macros.h" #include "ui/base/ime/input_method_base.h" namespace ui { diff --git a/ui/base/ime/input_method_minimal.cc b/ui/base/ime/input_method_minimal.cc index 9cb6161..8a5670e 100644 --- a/ui/base/ime/input_method_minimal.cc +++ b/ui/base/ime/input_method_minimal.cc @@ -4,6 +4,8 @@ #include "ui/base/ime/input_method_minimal.h" +#include <stdint.h> + #include "ui/base/ime/text_input_client.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" @@ -35,7 +37,7 @@ void InputMethodMinimal::DispatchKeyEvent(ui::KeyEvent* event) { // Insert the character. ignore_result(DispatchKeyEventPostIME(event)); if (event->type() == ET_KEY_PRESSED && GetTextInputClient()) { - const uint16 ch = event->GetCharacter(); + const uint16_t ch = event->GetCharacter(); if (ch) { GetTextInputClient()->InsertChar(*event); event->StopPropagation(); diff --git a/ui/base/ime/input_method_minimal.h b/ui/base/ime/input_method_minimal.h index 60d1a8e..cab74ad 100644 --- a/ui/base/ime/input_method_minimal.h +++ b/ui/base/ime/input_method_minimal.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_INPUT_METHOD_MINIMAL_H_ #define UI_BASE_IME_INPUT_METHOD_MINIMAL_H_ +#include "base/macros.h" #include "ui/base/ime/input_method_base.h" namespace ui { diff --git a/ui/base/ime/input_method_win.cc b/ui/base/ime/input_method_win.cc index ef500a7..56bbac1 100644 --- a/ui/base/ime/input_method_win.cc +++ b/ui/base/ime/input_method_win.cc @@ -4,8 +4,10 @@ #include "ui/base/ime/input_method_win.h" +#include <stddef.h> +#include <stdint.h> + #include "base/auto_reset.h" -#include "base/basictypes.h" #include "base/command_line.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/ime/win/tsf_input_scope.h" @@ -268,7 +270,7 @@ LRESULT InputMethodWin::OnChar(HWND window_handle, // A mask to determine the previous key state from |lparam|. The value is 1 // if the key is down before the message is sent, or it is 0 if the key is // up. - const uint32 kPrevKeyDownBit = 0x40000000; + const uint32_t kPrevKeyDownBit = 0x40000000; if (ch == kCarriageReturn && !(lparam & kPrevKeyDownBit)) accept_carriage_return_ = true; // Conditionally ignore '\r' events to work around crbug.com/319100. diff --git a/ui/base/ime/input_method_win.h b/ui/base/ime/input_method_win.h index d813e4e..ce41149 100644 --- a/ui/base/ime/input_method_win.h +++ b/ui/base/ime/input_method_win.h @@ -9,8 +9,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ime/input_method_base.h" #include "ui/base/ime/win/imm32_manager.h" diff --git a/ui/base/ime/linux/fake_input_method_context.h b/ui/base/ime/linux/fake_input_method_context.h index 717a019..ec9ac7e 100644 --- a/ui/base/ime/linux/fake_input_method_context.h +++ b/ui/base/ime/linux/fake_input_method_context.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_LINUX_FAKE_INPUT_METHOD_CONTEXT_H_ #define UI_BASE_IME_LINUX_FAKE_INPUT_METHOD_CONTEXT_H_ +#include "base/macros.h" #include "ui/base/ime/linux/linux_input_method_context.h" namespace ui { diff --git a/ui/base/ime/linux/fake_input_method_context_factory.h b/ui/base/ime/linux/fake_input_method_context_factory.h index a385f32..591e0d4 100644 --- a/ui/base/ime/linux/fake_input_method_context_factory.h +++ b/ui/base/ime/linux/fake_input_method_context_factory.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_IME_LINUX_FAKE_INPUT_METHOD_CONTEXT_FACTORY_H_ #define UI_BASE_IME_LINUX_FAKE_INPUT_METHOD_CONTEXT_FACTORY_H_ +#include "base/macros.h" #include "ui/base/ime/linux/linux_input_method_context_factory.h" namespace ui { diff --git a/ui/base/ime/mock_input_method.h b/ui/base/ime/mock_input_method.h index 0925e46..96d2c47 100644 --- a/ui/base/ime/mock_input_method.h +++ b/ui/base/ime/mock_input_method.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/observer_list.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_observer.h" diff --git a/ui/base/ime/remote_input_method_delegate_win.h b/ui/base/ime/remote_input_method_delegate_win.h index b65d8c3..a172c7b 100644 --- a/ui/base/ime/remote_input_method_delegate_win.h +++ b/ui/base/ime/remote_input_method_delegate_win.h @@ -5,9 +5,10 @@ #ifndef UI_BASE_IME_REMOTE_INPUT_METHOD_DELEGATE_WIN_H_ #define UI_BASE_IME_REMOTE_INPUT_METHOD_DELEGATE_WIN_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "ui/base/ime/ui_base_ime_export.h" #include "ui/gfx/geometry/rect.h" @@ -26,12 +27,12 @@ class UI_BASE_IME_EXPORT RemoteInputMethodDelegateWin { // Notifies that properties of the focused TextInputClient is changed. // Note that an empty |input_scopes| represents that TextInputType is // TEXT_INPUT_TYPE_NONE. - // Caveats: |input_scopes| is defined as std::vector<int32> rather than + // Caveats: |input_scopes| is defined as std::vector<int32_t> rather than // std::vector<InputScope> because the wire format of IPC message - // MetroViewerHostMsg_ImeTextInputClientUpdated uses std::vector<int32> to + // MetroViewerHostMsg_ImeTextInputClientUpdated uses std::vector<int32_t> to // avoid dependency on <InputScope.h> header. virtual void OnTextInputClientUpdated( - const std::vector<int32>& input_scopes, + const std::vector<int32_t>& input_scopes, const std::vector<gfx::Rect>& composition_character_bounds) = 0; }; diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc index 2fbb8ac..53f2612 100644 --- a/ui/base/ime/remote_input_method_win.cc +++ b/ui/base/ime/remote_input_method_win.cc @@ -4,7 +4,11 @@ #include "ui/base/ime/remote_input_method_win.h" +#include <stddef.h> +#include <stdint.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h" #include "base/win/metro.h" @@ -67,9 +71,9 @@ std::string GetLocaleString(LCID Locale_id, LCTYPE locale_type) { return result; } -std::vector<int32> GetInputScopesAsInt(TextInputType text_input_type, - TextInputMode text_input_mode) { - std::vector<int32> result; +std::vector<int32_t> GetInputScopesAsInt(TextInputType text_input_type, + TextInputMode text_input_mode) { + std::vector<int32_t> result; // An empty vector represents |text_input_type| is TEXT_INPUT_TYPE_NONE. if (text_input_type == TEXT_INPUT_TYPE_NONE) return result; @@ -78,7 +82,7 @@ std::vector<int32> GetInputScopesAsInt(TextInputType text_input_type, tsf_inputscope::GetInputScopes(text_input_type, text_input_mode); result.reserve(input_scopes.size()); for (size_t i = 0; i < input_scopes.size(); ++i) - result.push_back(static_cast<int32>(input_scopes[i])); + result.push_back(static_cast<int32_t>(input_scopes[i])); return result; } @@ -91,7 +95,7 @@ std::vector<gfx::Rect> GetCompositionCharacterBounds( if (client->HasCompositionText()) { gfx::Range range; if (client->GetCompositionTextRange(&range)) { - for (uint32 i = 0; i < range.length(); ++i) { + for (uint32_t i = 0; i < range.length(); ++i) { gfx::Rect rect; if (!client->GetCompositionCharacterBounds(i, &rect)) break; @@ -144,7 +148,7 @@ class RemoteInputMethodWin : public InputMethod, } void SetFocusedTextInputClient(TextInputClient* client) override { - std::vector<int32> prev_input_scopes; + std::vector<int32_t> prev_input_scopes; std::swap(input_scopes_, prev_input_scopes); std::vector<gfx::Rect> prev_bounds; std::swap(composition_character_bounds_, prev_bounds); @@ -203,7 +207,7 @@ class RemoteInputMethodWin : public InputMethod, void OnTextInputTypeChanged(const TextInputClient* client) override { if (!text_input_client_ || text_input_client_ != client) return; - std::vector<int32> prev_input_scopes; + std::vector<int32_t> prev_input_scopes; std::swap(input_scopes_, prev_input_scopes); input_scopes_ = GetInputScopesAsInt(client->GetTextInputType(), client->GetTextInputMode()); @@ -339,7 +343,7 @@ class RemoteInputMethodWin : public InputMethod, internal::RemoteInputMethodDelegateWin* remote_delegate_; TextInputClient* text_input_client_; - std::vector<int32> input_scopes_; + std::vector<int32_t> input_scopes_; std::vector<gfx::Rect> composition_character_bounds_; bool is_candidate_popup_open_; bool is_ime_; diff --git a/ui/base/ime/remote_input_method_win.h b/ui/base/ime/remote_input_method_win.h index 3f822cf..a1725b32 100644 --- a/ui/base/ime/remote_input_method_win.h +++ b/ui/base/ime/remote_input_method_win.h @@ -9,8 +9,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/remote_input_method_win_unittest.cc b/ui/base/ime/remote_input_method_win_unittest.cc index c234607..2d15919 100644 --- a/ui/base/ime/remote_input_method_win_unittest.cc +++ b/ui/base/ime/remote_input_method_win_unittest.cc @@ -5,9 +5,12 @@ #include "ui/base/ime/remote_input_method_win.h" #include <InputScope.h> +#include <stddef.h> +#include <stdint.h> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "base/strings/string16.h" @@ -94,7 +97,7 @@ class MockTextInputClient : public DummyTextInputClient { return text_input_mode_; } gfx::Rect GetCaretBounds() const override { return caret_bounds_; } - bool GetCompositionCharacterBounds(uint32 index, + bool GetCompositionCharacterBounds(uint32_t index, gfx::Rect* rect) const override { // Emulate the situation of crbug.com/328237. if (emulate_pepper_flash_) @@ -164,9 +167,7 @@ class MockRemoteInputMethodDelegateWin bool text_input_client_updated_called() const { return text_input_client_updated_called_; } - const std::vector<int32>& input_scopes() const { - return input_scopes_; - } + const std::vector<int32_t>& input_scopes() const { return input_scopes_; } const std::vector<gfx::Rect>& composition_character_bounds() const { return composition_character_bounds_; } @@ -181,7 +182,7 @@ class MockRemoteInputMethodDelegateWin void CancelComposition() override { cancel_composition_called_ = true; } void OnTextInputClientUpdated( - const std::vector<int32>& input_scopes, + const std::vector<int32_t>& input_scopes, const std::vector<gfx::Rect>& composition_character_bounds) override { text_input_client_updated_called_ = true; input_scopes_ = input_scopes; @@ -190,7 +191,7 @@ class MockRemoteInputMethodDelegateWin bool cancel_composition_called_; bool text_input_client_updated_called_; - std::vector<int32> input_scopes_; + std::vector<int32_t> input_scopes_; std::vector<gfx::Rect> composition_character_bounds_; DISALLOW_COPY_AND_ASSIGN(MockRemoteInputMethodDelegateWin); }; diff --git a/ui/base/ime/text_input_client.h b/ui/base/ime/text_input_client.h index ae2ee6f..552208c 100644 --- a/ui/base/ime/text_input_client.h +++ b/ui/base/ime/text_input_client.h @@ -5,7 +5,9 @@ #ifndef UI_BASE_IME_TEXT_INPUT_CLIENT_H_ #define UI_BASE_IME_TEXT_INPUT_CLIENT_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/i18n/rtl.h" #include "base/strings/string16.h" #include "ui/base/ime/composition_text.h" @@ -93,7 +95,7 @@ class UI_BASE_IME_EXPORT TextInputClient { // (Density Independent Pixel). // TODO(ime): Have a clear spec whether the returned value is DIP or not. // http://crbug.com/360334 - virtual bool GetCompositionCharacterBounds(uint32 index, + virtual bool GetCompositionCharacterBounds(uint32_t index, gfx::Rect* rect) const = 0; // Returns true if there is composition text. diff --git a/ui/base/ime/win/imm32_manager.cc b/ui/base/ime/win/imm32_manager.cc index 4fc1766..853bf3f 100644 --- a/ui/base/ime/win/imm32_manager.cc +++ b/ui/base/ime/win/imm32_manager.cc @@ -4,7 +4,9 @@ #include "ui/base/ime/win/imm32_manager.h" -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" @@ -70,9 +72,9 @@ void GetCompositionUnderlines(HIMC imm_context, ui::CompositionUnderlines* underlines) { int clause_size = ::ImmGetCompositionString(imm_context, GCS_COMPCLAUSE, NULL, 0); - int clause_length = clause_size / sizeof(uint32); + int clause_length = clause_size / sizeof(uint32_t); if (clause_length) { - scoped_ptr<uint32[]> clause_data(new uint32[clause_length]); + scoped_ptr<uint32_t[]> clause_data(new uint32_t[clause_length]); if (clause_data.get()) { ::ImmGetCompositionString(imm_context, GCS_COMPCLAUSE, clause_data.get(), clause_size); @@ -85,8 +87,8 @@ void GetCompositionUnderlines(HIMC imm_context, underline.background_color = SK_ColorTRANSPARENT; // Use thick underline for the target clause. - if (underline.start_offset >= static_cast<uint32>(target_start) && - underline.end_offset <= static_cast<uint32>(target_end)) { + if (underline.start_offset >= static_cast<uint32_t>(target_start) && + underline.end_offset <= static_cast<uint32_t>(target_end)) { underline.thick = true; } underlines->push_back(underline); @@ -327,19 +329,19 @@ void IMM32Manager::GetCompositionInfo(HIMC imm_context, LPARAM lparam, underline.background_color = SK_ColorTRANSPARENT; if (target_start > 0) { underline.start_offset = 0U; - underline.end_offset = static_cast<uint32>(target_start); + underline.end_offset = static_cast<uint32_t>(target_start); underline.thick = false; composition->underlines.push_back(underline); } if (target_end > target_start) { - underline.start_offset = static_cast<uint32>(target_start); - underline.end_offset = static_cast<uint32>(target_end); + underline.start_offset = static_cast<uint32_t>(target_start); + underline.end_offset = static_cast<uint32_t>(target_end); underline.thick = true; composition->underlines.push_back(underline); } if (target_end < length) { - underline.start_offset = static_cast<uint32>(target_end); - underline.end_offset = static_cast<uint32>(length); + underline.start_offset = static_cast<uint32_t>(target_end); + underline.end_offset = static_cast<uint32_t>(length); underline.thick = false; composition->underlines.push_back(underline); } diff --git a/ui/base/ime/win/imm32_manager.h b/ui/base/ime/win/imm32_manager.h index 0665919..b0fb1cd 100644 --- a/ui/base/ime/win/imm32_manager.h +++ b/ui/base/ime/win/imm32_manager.h @@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/ime/text_input_mode.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/win/tsf_input_scope.cc b/ui/base/ime/win/tsf_input_scope.cc index 4a75da0..347eea8 100644 --- a/ui/base/ime/win/tsf_input_scope.cc +++ b/ui/base/ime/win/tsf_input_scope.cc @@ -4,8 +4,11 @@ #include "ui/base/ime/win/tsf_input_scope.h" +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/win/windows_version.h" diff --git a/ui/base/ime/win/tsf_input_scope.h b/ui/base/ime/win/tsf_input_scope.h index d5caac3..e11e5de 100644 --- a/ui/base/ime/win/tsf_input_scope.h +++ b/ui/base/ime/win/tsf_input_scope.h @@ -9,7 +9,6 @@ #include <Windows.h> #include <vector> -#include "base/basictypes.h" #include "ui/base/ime/text_input_mode.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/ime/ui_base_ime_export.h" diff --git a/ui/base/ime/win/tsf_input_scope_unittest.cc b/ui/base/ime/win/tsf_input_scope_unittest.cc index de6ede1..ed36a18 100644 --- a/ui/base/ime/win/tsf_input_scope_unittest.cc +++ b/ui/base/ime/win/tsf_input_scope_unittest.cc @@ -5,6 +5,7 @@ #include "ui/base/ime/win/tsf_input_scope.h" #include <InputScope.h> +#include <stddef.h> #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/l10n/formatter.h b/ui/base/l10n/formatter.h index fcd410f..fa3936c 100644 --- a/ui/base/l10n/formatter.h +++ b/ui/base/l10n/formatter.h @@ -8,8 +8,8 @@ #ifndef UI_BASE_L10N_FORMATTER_H_ #define UI_BASE_L10N_FORMATTER_H_ -#include "base/basictypes.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/msgfmt.h" diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index c054b72..c3e850d 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -17,6 +17,7 @@ #include "base/i18n/rtl.h" #include "base/i18n/string_compare.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -820,7 +821,7 @@ base::string16 GetStringFUTF16Int(int message_id, int a) { return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::IntToString(a))); } -base::string16 GetStringFUTF16Int(int message_id, int64 a) { +base::string16 GetStringFUTF16Int(int message_id, int64_t a) { return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::Int64ToString(a))); } diff --git a/ui/base/l10n/l10n_util.h b/ui/base/l10n/l10n_util.h index 9317556..c7f04f4 100644 --- a/ui/base/l10n/l10n_util.h +++ b/ui/base/l10n/l10n_util.h @@ -8,10 +8,14 @@ #ifndef UI_BASE_L10N_L10N_UTIL_H_ #define UI_BASE_L10N_L10N_UTIL_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> #include "base/strings/string16.h" +#include "build/build_config.h" #include "ui/base/ui_base_export.h" #if defined(OS_MACOSX) @@ -160,7 +164,7 @@ UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id, // Convenience functions to get a string with a single number as a parameter. UI_BASE_EXPORT base::string16 GetStringFUTF16Int(int message_id, int a); -base::string16 GetStringFUTF16Int(int message_id, int64 a); +base::string16 GetStringFUTF16Int(int message_id, int64_t a); // Get a resource string using |number| with a locale-specific plural rule. // |message_id| points to a message in the ICU syntax. diff --git a/ui/base/l10n/l10n_util_android.cc b/ui/base/l10n/l10n_util_android.cc index a568541..6261969b 100644 --- a/ui/base/l10n/l10n_util_android.cc +++ b/ui/base/l10n/l10n_util_android.cc @@ -4,6 +4,8 @@ #include "ui/base/l10n/l10n_util_android.h" +#include <stdint.h> + #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" diff --git a/ui/base/l10n/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h index 9b53225..d2b95f2 100644 --- a/ui/base/l10n/l10n_util_collator.h +++ b/ui/base/l10n/l10n_util_collator.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_L10N_L10N_UTIL_COLLATOR_H_ #define UI_BASE_L10N_L10N_UTIL_COLLATOR_H_ +#include <stddef.h> + #include <algorithm> #include <functional> #include <string> diff --git a/ui/base/l10n/l10n_util_mac.h b/ui/base/l10n/l10n_util_mac.h index c1ef163..42f774d 100644 --- a/ui/base/l10n/l10n_util_mac.h +++ b/ui/base/l10n/l10n_util_mac.h @@ -5,10 +5,11 @@ #ifndef UI_BASE_L10N_L10N_UTIL_MAC_H_ #define UI_BASE_L10N_L10N_UTIL_MAC_H_ +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/l10n/l10n_util_mac_unittest.mm b/ui/base/l10n/l10n_util_mac_unittest.mm index adb0c57..7840155 100644 --- a/ui/base/l10n/l10n_util_mac_unittest.mm +++ b/ui/base/l10n/l10n_util_mac_unittest.mm @@ -3,7 +3,9 @@ // found in the LICENSE file. #import <Foundation/Foundation.h> +#include <stddef.h> +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/ui/base/l10n/l10n_util_posix.cc b/ui/base/l10n/l10n_util_posix.cc index 6415ff8..b57e78d 100644 --- a/ui/base/l10n/l10n_util_posix.cc +++ b/ui/base/l10n/l10n_util_posix.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> +#include "base/macros.h" +#include "build/build_config.h" + #if defined(OS_CHROMEOS) -#include "base/basictypes.h" #include "base/strings/string_util.h" #endif diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 43c9ad4..3719a1a 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -2,22 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "build/build_config.h" - -#if defined(OS_POSIX) && !defined(OS_MACOSX) -#include <cstdlib> -#endif +#include <stddef.h> -#include "base/basictypes.h" #include "base/environment.h" #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_path_override.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/icu/source/common/unicode/locid.h" @@ -25,6 +22,10 @@ #include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/ui_base_paths.h" +#if defined(OS_POSIX) && !defined(OS_MACOSX) +#include <cstdlib> +#endif + #if defined(OS_WIN) #include "base/win/windows_version.h" #endif diff --git a/ui/base/l10n/l10n_util_win.cc b/ui/base/l10n/l10n_util_win.cc index efc43e2..d86e02f 100644 --- a/ui/base/l10n/l10n_util_win.cc +++ b/ui/base/l10n/l10n_util_win.cc @@ -10,6 +10,7 @@ #include "base/i18n/rtl.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/base/l10n/time_format.h b/ui/base/l10n/time_format.h index 38da936..9fda463 100644 --- a/ui/base/l10n/time_format.h +++ b/ui/base/l10n/time_format.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_L10N_TIME_FORMAT_H_ #define UI_BASE_L10N_TIME_FORMAT_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/layout.cc b/ui/base/layout.cc index e49c24b..d8bc719 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -4,13 +4,15 @@ #include "ui/base/layout.h" +#include <stddef.h> + #include <algorithm> #include <cmath> #include <limits> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "build/build_config.h" #include "ui/base/touch/touch_device.h" #include "ui/base/ui_base_switches.h" diff --git a/ui/base/layout.h b/ui/base/layout.h index c0ca3cb..8b52858 100644 --- a/ui/base/layout.h +++ b/ui/base/layout.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "build/build_config.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc index 0702470..4b0c5b1 100644 --- a/ui/base/layout_unittest.cc +++ b/ui/base/layout_unittest.cc @@ -4,6 +4,7 @@ #include "ui/base/layout.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/ui/base/models/button_menu_item_model.h b/ui/base/models/button_menu_item_model.h index 01666fe..9c78b59 100644 --- a/ui/base/models/button_menu_item_model.h +++ b/ui/base/models/button_menu_item_model.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/models/list_model.h b/ui/base/models/list_model.h index 30ccc6c..f8212f2 100644 --- a/ui/base/models/list_model.h +++ b/ui/base/models/list_model.h @@ -5,10 +5,12 @@ #ifndef UI_BASE_MODELS_LIST_MODEL_H_ #define UI_BASE_MODELS_LIST_MODEL_H_ +#include <stddef.h> + #include <utility> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" diff --git a/ui/base/models/list_model_unittest.cc b/ui/base/models/list_model_unittest.cc index 8075a4a..b76fe0c 100644 --- a/ui/base/models/list_model_unittest.cc +++ b/ui/base/models/list_model_unittest.cc @@ -4,8 +4,10 @@ #include "ui/base/models/list_model.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/models/list_selection_model.h b/ui/base/models/list_selection_model.h index 234714d..6cd7952 100644 --- a/ui/base/models/list_selection_model.h +++ b/ui/base/models/list_selection_model.h @@ -5,9 +5,11 @@ #ifndef UI_BASE_MODELS_LIST_SELECTION_MODEL_H_ #define UI_BASE_MODELS_LIST_SELECTION_MODEL_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/models/list_selection_model_unittest.cc b/ui/base/models/list_selection_model_unittest.cc index 7f7a712..bcfe564 100644 --- a/ui/base/models/list_selection_model_unittest.cc +++ b/ui/base/models/list_selection_model_unittest.cc @@ -4,6 +4,8 @@ #include "ui/base/models/list_selection_model.h" +#include <stddef.h> + #include <algorithm> #include <string> diff --git a/ui/base/models/simple_combobox_model.h b/ui/base/models/simple_combobox_model.h index beaa04a..06e534a 100644 --- a/ui/base/models/simple_combobox_model.h +++ b/ui/base/models/simple_combobox_model.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_ #define UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_ +#include "base/macros.h" #include "ui/base/models/combobox_model.h" #include <vector> diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc index a8bfdb8..3fd26fa 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -4,6 +4,8 @@ #include "ui/base/models/simple_menu_model.h" +#include <stddef.h> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h index 9691d3b..639830d 100644 --- a/ui/base/models/simple_menu_model.h +++ b/ui/base/models/simple_menu_model.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "ui/base/models/menu_model.h" diff --git a/ui/base/models/tree_node_iterator.h b/ui/base/models/tree_node_iterator.h index f8664df..3a80e7c 100644 --- a/ui/base/models/tree_node_iterator.h +++ b/ui/base/models/tree_node_iterator.h @@ -7,9 +7,9 @@ #include <stack> -#include "base/basictypes.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" namespace ui { diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h index 5118578..9606dc8 100644 --- a/ui/base/models/tree_node_model.h +++ b/ui/base/models/tree_node_model.h @@ -5,12 +5,14 @@ #ifndef UI_BASE_MODELS_TREE_NODE_MODEL_H_ #define UI_BASE_MODELS_TREE_NODE_MODEL_H_ +#include <stddef.h> + #include <algorithm> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" diff --git a/ui/base/models/tree_node_model_unittest.cc b/ui/base/models/tree_node_model_unittest.cc index f83569f..da5f8f9 100644 --- a/ui/base/models/tree_node_model_unittest.cc +++ b/ui/base/models/tree_node_model_unittest.cc @@ -4,8 +4,8 @@ #include "ui/base/models/tree_node_model.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" diff --git a/ui/base/nine_image_painter_factory.cc b/ui/base/nine_image_painter_factory.cc index 3b47160..691e4ae 100644 --- a/ui/base/nine_image_painter_factory.cc +++ b/ui/base/nine_image_painter_factory.cc @@ -4,6 +4,8 @@ #include "ui/base/nine_image_painter_factory.h" +#include <stddef.h> + #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/nine_image_painter.h" diff --git a/ui/base/page_transition_types.cc b/ui/base/page_transition_types.cc index 62c4e5aa..d7623f5 100644 --- a/ui/base/page_transition_types.cc +++ b/ui/base/page_transition_types.cc @@ -20,13 +20,13 @@ PageTransition PageTransitionStripQualifier(PageTransition type) { return static_cast<PageTransition>(type & ~PAGE_TRANSITION_QUALIFIER_MASK); } -bool PageTransitionIsValidType(int32 type) { +bool PageTransitionIsValidType(int32_t type) { PageTransition t = PageTransitionStripQualifier( static_cast<PageTransition>(type)); return (t <= PAGE_TRANSITION_LAST_CORE); } -PageTransition PageTransitionFromInt(int32 type) { +PageTransition PageTransitionFromInt(int32_t type) { if (!PageTransitionIsValidType(type)) { NOTREACHED() << "Invalid transition type " << type; @@ -37,7 +37,7 @@ PageTransition PageTransitionFromInt(int32 type) { } bool PageTransitionIsMainFrame(PageTransition type) { - int32 t = PageTransitionStripQualifier(type); + int32_t t = PageTransitionStripQualifier(type); return (t != PAGE_TRANSITION_AUTO_SUBFRAME && t != PAGE_TRANSITION_MANUAL_SUBFRAME); } @@ -51,12 +51,12 @@ bool PageTransitionIsNewNavigation(PageTransition type) { !PageTransitionCoreTypeIs(type, PAGE_TRANSITION_RELOAD); } -int32 PageTransitionGetQualifier(PageTransition type) { +int32_t PageTransitionGetQualifier(PageTransition type) { return type & PAGE_TRANSITION_QUALIFIER_MASK; } bool PageTransitionIsWebTriggerable(PageTransition type) { - int32 t = PageTransitionStripQualifier(type); + int32_t t = PageTransitionStripQualifier(type); switch (t) { case PAGE_TRANSITION_LINK: case PAGE_TRANSITION_AUTO_SUBFRAME: @@ -68,7 +68,7 @@ bool PageTransitionIsWebTriggerable(PageTransition type) { } const char* PageTransitionGetCoreTransitionString(PageTransition type) { - int32 t = PageTransitionStripQualifier(type); + int32_t t = PageTransitionStripQualifier(type); switch (t) { case PAGE_TRANSITION_LINK: return "link"; case PAGE_TRANSITION_TYPED: return "typed"; diff --git a/ui/base/page_transition_types.h b/ui/base/page_transition_types.h index 4e54f92..ef0bb48 100644 --- a/ui/base/page_transition_types.h +++ b/ui/base/page_transition_types.h @@ -5,7 +5,8 @@ #ifndef UI_BASE_PAGE_TRANSITION_TYPES_H_ #define UI_BASE_PAGE_TRANSITION_TYPES_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "ui/base/ui_base_export.h" namespace ui { @@ -154,9 +155,9 @@ UI_BASE_EXPORT bool PageTransitionCoreTypeIs(PageTransition lhs, UI_BASE_EXPORT PageTransition PageTransitionStripQualifier( PageTransition type); -bool PageTransitionIsValidType(int32 type); +bool PageTransitionIsValidType(int32_t type); -UI_BASE_EXPORT PageTransition PageTransitionFromInt(int32 type); +UI_BASE_EXPORT PageTransition PageTransitionFromInt(int32_t type); // Returns true if the given transition is a top-level frame transition, or // false if the transition was for a subframe. @@ -170,7 +171,7 @@ UI_BASE_EXPORT bool PageTransitionIsRedirect(PageTransition type); UI_BASE_EXPORT bool PageTransitionIsNewNavigation(PageTransition type); // Return the qualifier -UI_BASE_EXPORT int32 PageTransitionGetQualifier(PageTransition type); +UI_BASE_EXPORT int32_t PageTransitionGetQualifier(PageTransition type); // Returns true if the transition can be triggered by the web instead of // through UI or similar. diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc index 090989d..245c1b7 100644 --- a/ui/base/resource/data_pack.cc +++ b/ui/base/resource/data_pack.cc @@ -19,17 +19,17 @@ namespace { -static const uint32 kFileFormatVersion = 4; +static const uint32_t kFileFormatVersion = 4; // Length of file header: version, entry count and text encoding type. -static const size_t kHeaderLength = 2 * sizeof(uint32) + sizeof(uint8); +static const size_t kHeaderLength = 2 * sizeof(uint32_t) + sizeof(uint8_t); #pragma pack(push,2) struct DataPackEntry { - uint16 resource_id; - uint32 file_offset; + uint16_t resource_id; + uint32_t file_offset; static int CompareById(const void* void_key, const void* void_entry) { - uint16 key = *reinterpret_cast<const uint16*>(void_key); + uint16_t key = *reinterpret_cast<const uint16_t*>(void_key); const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(void_entry); if (key < entry->resource_id) { @@ -116,9 +116,9 @@ bool DataPack::LoadImpl() { } // Parse the header of the file. - // First uint32: version; second: resource count; - const uint32* ptr = reinterpret_cast<const uint32*>(mmap_->data()); - uint32 version = ptr[0]; + // First uint32_t: version; second: resource count; + const uint32_t* ptr = reinterpret_cast<const uint32_t*>(mmap_->data()); + uint32_t version = ptr[0]; if (version != kFileFormatVersion) { LOG(ERROR) << "Bad data pack version: got " << version << ", expected " << kFileFormatVersion; @@ -130,7 +130,7 @@ bool DataPack::LoadImpl() { resource_count_ = ptr[1]; // third: text encoding. - const uint8* ptr_encoding = reinterpret_cast<const uint8*>(ptr + 2); + const uint8_t* ptr_encoding = reinterpret_cast<const uint8_t*>(ptr + 2); text_encoding_type_ = static_cast<TextEncodingType>(*ptr_encoding); if (text_encoding_type_ != UTF8 && text_encoding_type_ != UTF16 && text_encoding_type_ != BINARY) { @@ -172,12 +172,12 @@ bool DataPack::LoadImpl() { return true; } -bool DataPack::HasResource(uint16 resource_id) const { +bool DataPack::HasResource(uint16_t resource_id) const { return !!bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_, sizeof(DataPackEntry), DataPackEntry::CompareById); } -bool DataPack::GetStringPiece(uint16 resource_id, +bool DataPack::GetStringPiece(uint16_t resource_id, base::StringPiece* data) const { // It won't be hard to make this endian-agnostic, but it's not worth // bothering to do right now. @@ -217,7 +217,7 @@ bool DataPack::GetStringPiece(uint16 resource_id, } base::RefCountedStaticMemory* DataPack::GetStaticMemory( - uint16 resource_id) const { + uint16_t resource_id) const { base::StringPiece piece; if (!GetStringPiece(resource_id, &piece)) return NULL; @@ -243,7 +243,7 @@ void DataPack::CheckForDuplicateResources( for (size_t i = 0; i < resource_count_ + 1; ++i) { const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>( mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry))); - const uint16 resource_id = entry->resource_id; + const uint16_t resource_id = entry->resource_id; const float resource_scale = GetScaleForScaleFactor(scale_factor_); for (const ResourceHandle* handle : packs) { if (HasOnlyMaterialDesignAssets() != @@ -262,7 +262,7 @@ void DataPack::CheckForDuplicateResources( // static bool DataPack::WritePack(const base::FilePath& path, - const std::map<uint16, base::StringPiece>& resources, + const std::map<uint16_t, base::StringPiece>& resources, TextEncodingType textEncodingType) { FILE* file = base::OpenFile(path, "wb"); if (!file) @@ -276,7 +276,7 @@ bool DataPack::WritePack(const base::FilePath& path, // Note: the python version of this function explicitly sorted keys, but // std::map is a sorted associative container, we shouldn't have to do that. - uint32 entry_count = resources.size(); + uint32_t entry_count = resources.size(); if (fwrite(&entry_count, sizeof(entry_count), 1, file) != 1) { LOG(ERROR) << "Failed to write entry count"; base::CloseFile(file); @@ -291,21 +291,21 @@ bool DataPack::WritePack(const base::FilePath& path, return false; } - uint8 write_buffer = static_cast<uint8>(textEncodingType); - if (fwrite(&write_buffer, sizeof(uint8), 1, file) != 1) { + uint8_t write_buffer = static_cast<uint8_t>(textEncodingType); + if (fwrite(&write_buffer, sizeof(uint8_t), 1, file) != 1) { LOG(ERROR) << "Failed to write file text resources encoding"; base::CloseFile(file); return false; } - // Each entry is a uint16 + a uint32. We have an extra entry after the last - // item so we can compute the size of the list item. - uint32 index_length = (entry_count + 1) * sizeof(DataPackEntry); - uint32 data_offset = kHeaderLength + index_length; - for (std::map<uint16, base::StringPiece>::const_iterator it = + // Each entry is a uint16_t + a uint32_t. We have an extra entry after the + // last item so we can compute the size of the list item. + uint32_t index_length = (entry_count + 1) * sizeof(DataPackEntry); + uint32_t data_offset = kHeaderLength + index_length; + for (std::map<uint16_t, base::StringPiece>::const_iterator it = resources.begin(); it != resources.end(); ++it) { - uint16 resource_id = it->first; + uint16_t resource_id = it->first; if (fwrite(&resource_id, sizeof(resource_id), 1, file) != 1) { LOG(ERROR) << "Failed to write id for " << resource_id; base::CloseFile(file); @@ -323,7 +323,7 @@ bool DataPack::WritePack(const base::FilePath& path, // We place an extra entry after the last item that allows us to read the // size of the last item. - uint16 resource_id = 0; + uint16_t resource_id = 0; if (fwrite(&resource_id, sizeof(resource_id), 1, file) != 1) { LOG(ERROR) << "Failed to write extra resource id."; base::CloseFile(file); @@ -336,7 +336,7 @@ bool DataPack::WritePack(const base::FilePath& path, return false; } - for (std::map<uint16, base::StringPiece>::const_iterator it = + for (std::map<uint16_t, base::StringPiece>::const_iterator it = resources.begin(); it != resources.end(); ++it) { if (fwrite(it->second.data(), it->second.length(), 1, file) != 1) { diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h index aed737b..b2d9068 100644 --- a/ui/base/resource/data_pack.h +++ b/ui/base/resource/data_pack.h @@ -9,11 +9,14 @@ #ifndef UI_BASE_RESOURCE_DATA_PACK_H_ #define UI_BASE_RESOURCE_DATA_PACK_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> -#include "base/basictypes.h" #include "base/files/file.h" #include "base/files/memory_mapped_file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string_piece.h" @@ -52,15 +55,15 @@ class UI_BASE_EXPORT DataPack : public ResourceHandle { // |textEncodingType| specified. If no text resources are present, please // indicate BINARY. static bool WritePack(const base::FilePath& path, - const std::map<uint16, base::StringPiece>& resources, + const std::map<uint16_t, base::StringPiece>& resources, TextEncodingType textEncodingType); // ResourceHandle implementation: - bool HasResource(uint16 resource_id) const override; - bool GetStringPiece(uint16 resource_id, + bool HasResource(uint16_t resource_id) const override; + bool GetStringPiece(uint16_t resource_id, base::StringPiece* data) const override; base::RefCountedStaticMemory* GetStaticMemory( - uint16 resource_id) const override; + uint16_t resource_id) const override; TextEncodingType GetTextEncodingType() const override; ui::ScaleFactor GetScaleFactor() const override; bool HasOnlyMaterialDesignAssets() const override; diff --git a/ui/base/resource/data_pack_literal.cc b/ui/base/resource/data_pack_literal.cc index 672e552..cf49086 100644 --- a/ui/base/resource/data_pack_literal.cc +++ b/ui/base/resource/data_pack_literal.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> namespace ui { diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index 966bf13..33d5e41 100644 --- a/ui/base/resource/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -4,6 +4,9 @@ #include "ui/base/resource/data_pack.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include "base/files/file.h" @@ -12,6 +15,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/strings/string_piece.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/ui_base_paths.h" @@ -162,7 +166,7 @@ TEST_P(DataPackTest, Write) { std::string four("four"); std::string fifteen("fifteen"); - std::map<uint16, base::StringPiece> resources; + std::map<uint16_t, base::StringPiece> resources; resources.insert(std::make_pair(1, base::StringPiece(one))); resources.insert(std::make_pair(2, base::StringPiece(two))); resources.insert(std::make_pair(15, base::StringPiece(fifteen))); diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index d64f013..a2aa582 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -4,6 +4,8 @@ #include "ui/base/resource/resource_bundle.h" +#include <stdint.h> + #include <limits> #include <utility> #include <vector> @@ -13,6 +15,7 @@ #include "base/files/file.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" #include "base/path_service.h" @@ -467,7 +470,7 @@ base::StringPiece ResourceBundle::GetRawDataResourceForScale( if (scale_factor != ui::SCALE_FACTOR_100P) { for (size_t i = 0; i < data_packs_.size(); i++) { if (data_packs_[i]->GetScaleFactor() == scale_factor && - data_packs_[i]->GetStringPiece(static_cast<uint16>(resource_id), + data_packs_[i]->GetStringPiece(static_cast<uint16_t>(resource_id), &data)) return data; } @@ -478,7 +481,7 @@ base::StringPiece ResourceBundle::GetRawDataResourceForScale( data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_200P || data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_300P || data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_NONE) && - data_packs_[i]->GetStringPiece(static_cast<uint16>(resource_id), + data_packs_[i]->GetStringPiece(static_cast<uint16_t>(resource_id), &data)) return data; } @@ -508,7 +511,7 @@ base::string16 ResourceBundle::GetLocalizedString(int message_id) { } base::StringPiece data; - if (!locale_resources_data_->GetStringPiece(static_cast<uint16>(message_id), + if (!locale_resources_data_->GetStringPiece(static_cast<uint16_t>(message_id), &data)) { // Fall back on the main data pack (shouldn't be any strings here except in // unittests). @@ -822,7 +825,7 @@ bool ResourceBundle::LoadBitmap(const ResourceHandle& data_handle, bool* fell_back_to_1x) const { DCHECK(fell_back_to_1x); scoped_refptr<base::RefCountedMemory> memory( - data_handle.GetStaticMemory(static_cast<uint16>(resource_id))); + data_handle.GetStaticMemory(static_cast<uint16_t>(resource_id))); if (!memory.get()) return false; @@ -893,15 +896,16 @@ bool ResourceBundle::PNGContainsFallbackMarker(const unsigned char* buf, for (;;) { if (size - pos < kPngChunkMetadataSize) break; - uint32 length = 0; + uint32_t length = 0; base::ReadBigEndian(reinterpret_cast<const char*>(buf + pos), &length); if (size - pos - kPngChunkMetadataSize < length) break; - if (length == 0 && memcmp(buf + pos + sizeof(uint32), kPngScaleChunkType, - arraysize(kPngScaleChunkType)) == 0) { + if (length == 0 && + memcmp(buf + pos + sizeof(uint32_t), kPngScaleChunkType, + arraysize(kPngScaleChunkType)) == 0) { return true; } - if (memcmp(buf + pos + sizeof(uint32), kPngDataChunkType, + if (memcmp(buf + pos + sizeof(uint32_t), kPngDataChunkType, arraysize(kPngDataChunkType)) == 0) { // Stop looking for custom chunks, any custom chunks should be before an // IDAT chunk. diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index 94ba811..3e169a4 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -5,14 +5,16 @@ #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ +#include <stddef.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string16.h" diff --git a/ui/base/resource/resource_bundle_android.h b/ui/base/resource/resource_bundle_android.h index a9d3b1d..ffce054 100644 --- a/ui/base/resource/resource_bundle_android.h +++ b/ui/base/resource/resource_bundle_android.h @@ -8,7 +8,6 @@ #include <jni.h> #include <string> -#include "base/basictypes.h" #include "base/files/memory_mapped_file.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm index 1cd00d1..88cf829 100644 --- a/ui/base/resource/resource_bundle_ios.mm +++ b/ui/base/resource/resource_bundle_ios.mm @@ -7,7 +7,6 @@ #import <QuartzCore/QuartzCore.h> #import <UIKit/UIKit.h> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/mac/bundle_locations.h" diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 27f1608..74d8261 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -5,8 +5,8 @@ #include "ui/base/resource/resource_bundle.h" #import <AppKit/AppKit.h> +#include <stddef.h> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/mac/bundle_locations.h" diff --git a/ui/base/resource/resource_bundle_mac_unittest.mm b/ui/base/resource/resource_bundle_mac_unittest.mm index 9b43bec..c52f6c3 100644 --- a/ui/base/resource/resource_bundle_mac_unittest.mm +++ b/ui/base/resource/resource_bundle_mac_unittest.mm @@ -5,6 +5,8 @@ #include "ui/base/resource/resource_bundle.h" #import <AppKit/AppKit.h> +#include <stddef.h> +#include <stdint.h> #include "base/base_paths.h" #include "base/big_endian.h" @@ -12,6 +14,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -43,16 +46,16 @@ void AddCustomChunk(const base::StringPiece& custom_chunk, kPngMagic)); std::vector<unsigned char>::iterator ihdr_start = bitmap_data->begin() + arraysize(kPngMagic); - char ihdr_length_data[sizeof(uint32)]; - for (size_t i = 0; i < sizeof(uint32); ++i) + char ihdr_length_data[sizeof(uint32_t)]; + for (size_t i = 0; i < sizeof(uint32_t); ++i) ihdr_length_data[i] = *(ihdr_start + i); - uint32 ihdr_chunk_length = 0; + uint32_t ihdr_chunk_length = 0; base::ReadBigEndian(reinterpret_cast<char*>(ihdr_length_data), &ihdr_chunk_length); - EXPECT_TRUE(std::equal( - ihdr_start + sizeof(uint32), - ihdr_start + sizeof(uint32) + sizeof(kPngIHDRChunkType), - kPngIHDRChunkType)); + EXPECT_TRUE( + std::equal(ihdr_start + sizeof(uint32_t), + ihdr_start + sizeof(uint32_t) + sizeof(kPngIHDRChunkType), + kPngIHDRChunkType)); bitmap_data->insert(ihdr_start + kPngChunkMetadataSize + ihdr_chunk_length, custom_chunk.begin(), custom_chunk.end()); @@ -74,7 +77,7 @@ void CreateDataPackWithSingleBitmap(const base::FilePath& path, if (custom_chunk.size() > 0) AddCustomChunk(custom_chunk, &bitmap_data); - std::map<uint16, base::StringPiece> resources; + std::map<uint16_t, base::StringPiece> resources; resources[3u] = base::StringPiece( reinterpret_cast<const char*>(&bitmap_data[0]), bitmap_data.size()); DataPack::WritePack(path, resources, ui::DataPack::BINARY); diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index 6f95c77..eac9ef3 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -4,14 +4,19 @@ #include "ui/base/resource/resource_bundle.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base_paths.h" #include "base/big_endian.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -105,16 +110,16 @@ void AddCustomChunk(const base::StringPiece& custom_chunk, kPngMagic)); std::vector<unsigned char>::iterator ihdr_start = bitmap_data->begin() + arraysize(kPngMagic); - char ihdr_length_data[sizeof(uint32)]; - for (size_t i = 0; i < sizeof(uint32); ++i) + char ihdr_length_data[sizeof(uint32_t)]; + for (size_t i = 0; i < sizeof(uint32_t); ++i) ihdr_length_data[i] = *(ihdr_start + i); - uint32 ihdr_chunk_length = 0; + uint32_t ihdr_chunk_length = 0; base::ReadBigEndian(reinterpret_cast<char*>(ihdr_length_data), &ihdr_chunk_length); - EXPECT_TRUE(std::equal( - ihdr_start + sizeof(uint32), - ihdr_start + sizeof(uint32) + sizeof(kPngIHDRChunkType), - kPngIHDRChunkType)); + EXPECT_TRUE( + std::equal(ihdr_start + sizeof(uint32_t), + ihdr_start + sizeof(uint32_t) + sizeof(kPngIHDRChunkType), + kPngIHDRChunkType)); bitmap_data->insert(ihdr_start + kPngChunkMetadataSize + ihdr_chunk_length, custom_chunk.begin(), custom_chunk.end()); @@ -136,7 +141,7 @@ void CreateDataPackWithSingleBitmap(const base::FilePath& path, if (custom_chunk.size() > 0) AddCustomChunk(custom_chunk, &bitmap_data); - std::map<uint16, base::StringPiece> resources; + std::map<uint16_t, base::StringPiece> resources; resources[3u] = base::StringPiece( reinterpret_cast<const char*>(&bitmap_data[0]), bitmap_data.size()); DataPack::WritePack(path, resources, ui::DataPack::BINARY); diff --git a/ui/base/resource/resource_bundle_win.h b/ui/base/resource/resource_bundle_win.h index 811464e..92590ea 100644 --- a/ui/base/resource/resource_bundle_win.h +++ b/ui/base/resource/resource_bundle_win.h @@ -9,7 +9,6 @@ #include <windows.h> -#include "base/basictypes.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/resource/resource_data_dll_win.cc b/ui/base/resource/resource_data_dll_win.cc index 1b8ff45..4cf3266 100644 --- a/ui/base/resource/resource_data_dll_win.cc +++ b/ui/base/resource/resource_data_dll_win.cc @@ -4,6 +4,8 @@ #include "ui/base/resource/resource_data_dll_win.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/win/resource_util.h" @@ -17,7 +19,7 @@ ResourceDataDLL::ResourceDataDLL(HINSTANCE module) : module_(module) { ResourceDataDLL::~ResourceDataDLL() { } -bool ResourceDataDLL::HasResource(uint16 resource_id) const { +bool ResourceDataDLL::HasResource(uint16_t resource_id) const { void* data_ptr; size_t data_size; return base::win::GetDataResourceFromModule(module_, @@ -26,7 +28,7 @@ bool ResourceDataDLL::HasResource(uint16 resource_id) const { &data_size); } -bool ResourceDataDLL::GetStringPiece(uint16 resource_id, +bool ResourceDataDLL::GetStringPiece(uint16_t resource_id, base::StringPiece* data) const { DCHECK(data); void* data_ptr; @@ -42,7 +44,7 @@ bool ResourceDataDLL::GetStringPiece(uint16 resource_id, } base::RefCountedStaticMemory* ResourceDataDLL::GetStaticMemory( - uint16 resource_id) const { + uint16_t resource_id) const { void* data_ptr; size_t data_size; if (base::win::GetDataResourceFromModule(module_, resource_id, &data_ptr, diff --git a/ui/base/resource/resource_data_dll_win.h b/ui/base/resource/resource_data_dll_win.h index 1ad1f9b..b7f6018 100644 --- a/ui/base/resource/resource_data_dll_win.h +++ b/ui/base/resource/resource_data_dll_win.h @@ -6,8 +6,10 @@ #define UI_BASE_RESOURCE_RESOURCE_DATA_DLL_WIN_H_ #include <windows.h> +#include <stdint.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/resource/resource_handle.h" namespace ui { @@ -18,11 +20,11 @@ class ResourceDataDLL : public ResourceHandle { ~ResourceDataDLL() override; // ResourceHandle implementation: - bool HasResource(uint16 resource_id) const override; - bool GetStringPiece(uint16 resource_id, + bool HasResource(uint16_t resource_id) const override; + bool GetStringPiece(uint16_t resource_id, base::StringPiece* data) const override; base::RefCountedStaticMemory* GetStaticMemory( - uint16 resource_id) const override; + uint16_t resource_id) const override; TextEncodingType GetTextEncodingType() const override; ScaleFactor GetScaleFactor() const override; bool HasOnlyMaterialDesignAssets() const override; diff --git a/ui/base/resource/resource_handle.h b/ui/base/resource/resource_handle.h index 4795834..138c739 100644 --- a/ui/base/resource/resource_handle.h +++ b/ui/base/resource/resource_handle.h @@ -5,7 +5,8 @@ #ifndef UI_BASE_RESOURCE_RESOURCE_HANDLE_H_ #define UI_BASE_RESOURCE_RESOURCE_HANDLE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/strings/string_piece.h" #include "ui/base/layout.h" #include "ui/base/ui_base_export.h" @@ -28,18 +29,18 @@ class UI_BASE_EXPORT ResourceHandle { virtual ~ResourceHandle() {} // Returns true if the DataPack contains a resource with id |resource_id|. - virtual bool HasResource(uint16 resource_id) const = 0; + virtual bool HasResource(uint16_t resource_id) const = 0; // Get resource by id |resource_id|, filling in |data|. // The data is owned by the DataPack object and should not be modified. // Returns false if the resource id isn't found. - virtual bool GetStringPiece(uint16 resource_id, + virtual bool GetStringPiece(uint16_t resource_id, base::StringPiece* data) const = 0; // Like GetStringPiece(), but returns a reference to memory. // Caller owns the returned object. virtual base::RefCountedStaticMemory* GetStaticMemory( - uint16 resource_id) const = 0; + uint16_t resource_id) const = 0; // Get the encoding type of text resources. virtual TextEncodingType GetTextEncodingType() const = 0; diff --git a/ui/base/template_expressions.cc b/ui/base/template_expressions.cc index c834a71..1d63e0c 100644 --- a/ui/base/template_expressions.cc +++ b/ui/base/template_expressions.cc @@ -4,6 +4,8 @@ #include "ui/base/template_expressions.h" +#include <stddef.h> + #include "base/logging.h" namespace ui { diff --git a/ui/base/test/run_all_unittests.cc b/ui/base/test/run_all_unittests.cc index bc3c39f..26ebad4 100644 --- a/ui/base/test/run_all_unittests.cc +++ b/ui/base/test/run_all_unittests.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" diff --git a/ui/base/test/scoped_fake_nswindow_focus.h b/ui/base/test/scoped_fake_nswindow_focus.h index aafd715..fd0597f 100644 --- a/ui/base/test/scoped_fake_nswindow_focus.h +++ b/ui/base/test/scoped_fake_nswindow_focus.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_TEST_SCOPED_FAKE_NSWINDOW_FOCUS_H_ #define UI_BASE_TEST_SCOPED_FAKE_NSWINDOW_FOCUS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace base { diff --git a/ui/base/test/scoped_fake_nswindow_fullscreen.mm b/ui/base/test/scoped_fake_nswindow_fullscreen.mm index 943e97b..b09c1f4 100644 --- a/ui/base/test/scoped_fake_nswindow_fullscreen.mm +++ b/ui/base/test/scoped_fake_nswindow_fullscreen.mm @@ -12,6 +12,7 @@ #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" #import "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" // This method exists on NSWindowDelegate on 10.7+. diff --git a/ui/base/test/test_clipboard.cc b/ui/base/test/test_clipboard.cc index 530037d..271ab05 100644 --- a/ui/base/test/test_clipboard.cc +++ b/ui/base/test/test_clipboard.cc @@ -25,7 +25,7 @@ Clipboard* TestClipboard::CreateForCurrentThread() { return clipboard; } -uint64 TestClipboard::GetSequenceNumber(ClipboardType type) const { +uint64_t TestClipboard::GetSequenceNumber(ClipboardType type) const { return GetStore(type).sequence_number; } @@ -75,8 +75,8 @@ void TestClipboard::ReadAsciiText(ClipboardType type, void TestClipboard::ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const { + uint32_t* fragment_start, + uint32_t* fragment_end) const { markup->clear(); src_url->clear(); const DataStore& store = GetStore(type); @@ -85,7 +85,7 @@ void TestClipboard::ReadHTML(ClipboardType type, *markup = base::UTF8ToUTF16(it->second); *src_url = store.html_src_url; *fragment_start = 0; - *fragment_end = base::checked_cast<uint32>(markup->size()); + *fragment_end = base::checked_cast<uint32_t>(markup->size()); } void TestClipboard::ReadRTF(ClipboardType type, std::string* result) const { diff --git a/ui/base/test/test_clipboard.h b/ui/base/test/test_clipboard.h index 58fa507..57e21e9 100644 --- a/ui/base/test/test_clipboard.h +++ b/ui/base/test/test_clipboard.h @@ -5,7 +5,12 @@ #ifndef UI_BASE_TEST_TEST_CLIPBOARD_H_ #define UI_BASE_TEST_TEST_CLIPBOARD_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> + +#include "base/macros.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" @@ -22,7 +27,7 @@ class TestClipboard : public Clipboard { static Clipboard* CreateForCurrentThread(); // Clipboard overrides. - uint64 GetSequenceNumber(ClipboardType type) const override; + uint64_t GetSequenceNumber(ClipboardType type) const override; bool IsFormatAvailable(const FormatType& format, ClipboardType type) const override; void Clear(ClipboardType type) override; @@ -34,8 +39,8 @@ class TestClipboard : public Clipboard { void ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const override; + uint32_t* fragment_start, + uint32_t* fragment_end) const override; void ReadRTF(ClipboardType type, std::string* result) const override; SkBitmap ReadImage(ClipboardType type) const override; void ReadCustomData(ClipboardType clipboard_type, @@ -65,7 +70,7 @@ class TestClipboard : public Clipboard { DataStore(); ~DataStore(); void Clear(); - uint64 sequence_number; + uint64_t sequence_number; std::map<FormatType, std::string> data; std::string url_title; std::string html_src_url; diff --git a/ui/base/test/ui_controls_internal_win.cc b/ui/base/test/ui_controls_internal_win.cc index 0dadb6d..f915c63 100644 --- a/ui/base/test/ui_controls_internal_win.cc +++ b/ui/base/test/ui_controls_internal_win.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" diff --git a/ui/base/text/bytes_formatting.cc b/ui/base/text/bytes_formatting.cc index 7f98c6b..aff188c 100644 --- a/ui/base/text/bytes_formatting.cc +++ b/ui/base/text/bytes_formatting.cc @@ -6,6 +6,7 @@ #include "base/i18n/number_formatting.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/l10n/l10n_util.h" @@ -34,7 +35,7 @@ const int kSpeedStrings[] = { IDS_APP_PEBIBYTES_PER_SECOND }; -base::string16 FormatBytesInternal(int64 bytes, +base::string16 FormatBytesInternal(int64_t bytes, DataUnits units, bool show_units, const int* const suffix) { @@ -63,17 +64,17 @@ base::string16 FormatBytesInternal(int64 bytes, } // namespace -DataUnits GetByteDisplayUnits(int64 bytes) { +DataUnits GetByteDisplayUnits(int64_t bytes) { // The byte thresholds at which we display amounts. A byte count is displayed // in unit U when kUnitThresholds[U] <= bytes < kUnitThresholds[U+1]. // This must match the DataUnits enum. - static const int64 kUnitThresholds[] = { - 0, // DATA_UNITS_BYTE, - 3 * (1LL << 10), // DATA_UNITS_KIBIBYTE, - 2 * (1LL << 20), // DATA_UNITS_MEBIBYTE, - 1LL << 30, // DATA_UNITS_GIBIBYTE, - 1LL << 40, // DATA_UNITS_TEBIBYTE, - 1LL << 50 // DATA_UNITS_PEBIBYTE, + static const int64_t kUnitThresholds[] = { + 0, // DATA_UNITS_BYTE, + 3 * (1LL << 10), // DATA_UNITS_KIBIBYTE, + 2 * (1LL << 20), // DATA_UNITS_MEBIBYTE, + 1LL << 30, // DATA_UNITS_GIBIBYTE, + 1LL << 40, // DATA_UNITS_TEBIBYTE, + 1LL << 50 // DATA_UNITS_PEBIBYTE, }; if (bytes < 0) { @@ -91,23 +92,23 @@ DataUnits GetByteDisplayUnits(int64 bytes) { return DataUnits(unit_index); } -base::string16 FormatBytesWithUnits(int64 bytes, +base::string16 FormatBytesWithUnits(int64_t bytes, DataUnits units, bool show_units) { return FormatBytesInternal(bytes, units, show_units, kByteStrings); } -base::string16 FormatSpeedWithUnits(int64 bytes, +base::string16 FormatSpeedWithUnits(int64_t bytes, DataUnits units, bool show_units) { return FormatBytesInternal(bytes, units, show_units, kSpeedStrings); } -base::string16 FormatBytes(int64 bytes) { +base::string16 FormatBytes(int64_t bytes) { return FormatBytesWithUnits(bytes, GetByteDisplayUnits(bytes), true); } -base::string16 FormatSpeed(int64 bytes) { +base::string16 FormatSpeed(int64_t bytes) { return FormatSpeedWithUnits(bytes, GetByteDisplayUnits(bytes), true); } diff --git a/ui/base/text/bytes_formatting.h b/ui/base/text/bytes_formatting.h index 46de51c..7cb6e45 100644 --- a/ui/base/text/bytes_formatting.h +++ b/ui/base/text/bytes_formatting.h @@ -5,7 +5,8 @@ #ifndef UI_BASE_TEXT_BYTES_FORMATTING_H_ #define UI_BASE_TEXT_BYTES_FORMATTING_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" @@ -16,12 +17,12 @@ namespace ui { // Simple call to return a byte quantity as a string in human-readable format. // Ex: FormatBytes(512) => "512 B" // Ex: FormatBytes(101479) => "99.1 kB" -UI_BASE_EXPORT base::string16 FormatBytes(int64 bytes); +UI_BASE_EXPORT base::string16 FormatBytes(int64_t bytes); // Simple call to return a speed as a string in human-readable format. // Ex: FormatSpeed(512) => "512 B/s" // Ex: FormatSpeed(101479) => "99.1 kB/s" -UI_BASE_EXPORT base::string16 FormatSpeed(int64 bytes); +UI_BASE_EXPORT base::string16 FormatSpeed(int64_t bytes); // Less-Simple API ------------------------------------------------------------- @@ -37,20 +38,20 @@ enum DataUnits { // Return the unit type that is appropriate for displaying the amount of bytes // passed in. Most of the time, an explicit call to this isn't necessary; just // use FormatBytes()/FormatSpeed() above. -UI_BASE_EXPORT DataUnits GetByteDisplayUnits(int64 bytes); +UI_BASE_EXPORT DataUnits GetByteDisplayUnits(int64_t bytes); // Return a byte quantity as a string in human-readable format with an optional // unit suffix. Specify in the |units| argument the units to be used. // Ex: FormatBytes(512, DATA_UNITS_KIBIBYTE, true) => "0.5 kB" // Ex: FormatBytes(10*1024, DATA_UNITS_MEBIBYTE, false) => "0.1" -UI_BASE_EXPORT base::string16 FormatBytesWithUnits(int64 bytes, +UI_BASE_EXPORT base::string16 FormatBytesWithUnits(int64_t bytes, DataUnits units, bool show_units); // As above, but with "/s" units for speed values. // Ex: FormatSpeed(512, DATA_UNITS_KIBIBYTE, true) => "0.5 kB/s" // Ex: FormatSpeed(10*1024, DATA_UNITS_MEBIBYTE, false) => "0.1" -base::string16 FormatSpeedWithUnits(int64 bytes, +base::string16 FormatSpeedWithUnits(int64_t bytes, DataUnits units, bool show_units); diff --git a/ui/base/text/bytes_formatting_unittest.cc b/ui/base/text/bytes_formatting_unittest.cc index 308996c..b2c2a41 100644 --- a/ui/base/text/bytes_formatting_unittest.cc +++ b/ui/base/text/bytes_formatting_unittest.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/text/bytes_formatting.h" @@ -10,7 +14,7 @@ namespace ui { TEST(BytesFormattingTest, GetByteDisplayUnits) { static const struct { - int64 bytes; + int64_t bytes; DataUnits expected; } cases[] = { {0, DATA_UNITS_BYTE}, @@ -31,7 +35,7 @@ TEST(BytesFormattingTest, GetByteDisplayUnits) { TEST(BytesFormattingTest, FormatBytes) { static const struct { - int64 bytes; + int64_t bytes; DataUnits units; const char* expected; const char* expected_with_units; diff --git a/ui/base/theme_provider.h b/ui/base/theme_provider.h index 7ad97da..fa86e43 100644 --- a/ui/base/theme_provider.h +++ b/ui/base/theme_provider.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_THEME_PROVIDER_H_ #define UI_BASE_THEME_PROVIDER_H_ -#include "base/basictypes.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/layout.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/touch/touch_device.h b/ui/base/touch/touch_device.h index 5ea6726..544a5ed 100644 --- a/ui/base/touch/touch_device.h +++ b/ui/base/touch/touch_device.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_TOUCH_TOUCH_DEVICE_H_ #define UI_BASE_TOUCH_TOUCH_DEVICE_H_ +#include "build/build_config.h" #include "ui/base/ui_base_export.h" #if defined(OS_ANDROID) diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc index c0246f8..48aae4c 100644 --- a/ui/base/ui_base_paths.cc +++ b/ui/base/ui_base_paths.cc @@ -9,6 +9,7 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "build/build_config.h" #if defined(OS_ANDROID) #include "base/android/path_utils.h" diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index db9c274..76609e1 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "ui/base/ui_base_switches.h" namespace switches { diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 0c02dbc..e0c5849 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -8,6 +8,7 @@ #define UI_BASE_UI_BASE_SWITCHES_H_ #include "base/compiler_specific.h" +#include "build/build_config.h" #include "ui/base/ui_base_export.h" namespace switches { diff --git a/ui/base/ui_base_switches_util.cc b/ui/base/ui_base_switches_util.cc index d579bf4..0830b3b 100644 --- a/ui/base/ui_base_switches_util.cc +++ b/ui/base/ui_base_switches_util.cc @@ -5,6 +5,7 @@ #include "ui/base/ui_base_switches_util.h" #include "base/command_line.h" +#include "build/build_config.h" #include "ui/base/ui_base_switches.h" namespace switches { diff --git a/ui/base/user_activity/user_activity_detector.cc b/ui/base/user_activity/user_activity_detector.cc index 78812bc..bffe479 100644 --- a/ui/base/user_activity/user_activity_detector.cc +++ b/ui/base/user_activity/user_activity_detector.cc @@ -7,6 +7,7 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "ui/base/user_activity/user_activity_observer.h" #include "ui/events/event_utils.h" #include "ui/events/platform/platform_event_source.h" diff --git a/ui/base/user_activity/user_activity_detector.h b/ui/base/user_activity/user_activity_detector.h index 4ec398f9..a480bedd 100644 --- a/ui/base/user_activity/user_activity_detector.h +++ b/ui/base/user_activity/user_activity_detector.h @@ -5,8 +5,8 @@ #ifndef UI_BASE_USER_ACTIVITY_USER_ACTIVITY_DETECTOR_H_ #define UI_BASE_USER_ACTIVITY_USER_ACTIVITY_DETECTOR_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/time/time.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/user_activity/user_activity_detector_unittest.cc b/ui/base/user_activity/user_activity_detector_unittest.cc index 68d9056..baebd1d 100644 --- a/ui/base/user_activity/user_activity_detector_unittest.cc +++ b/ui/base/user_activity/user_activity_detector_unittest.cc @@ -5,6 +5,7 @@ #include "ui/base/user_activity/user_activity_detector.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/user_activity/user_activity_observer.h b/ui/base/user_activity/user_activity_observer.h index 7990cb8..f6b98d2 100644 --- a/ui/base/user_activity/user_activity_observer.h +++ b/ui/base/user_activity/user_activity_observer.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_ #define UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/view_prop.cc b/ui/base/view_prop.cc index cb58553..2ff403e 100644 --- a/ui/base/view_prop.cc +++ b/ui/base/view_prop.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "ui/base/view_prop.h" #include <set> diff --git a/ui/base/view_prop.h b/ui/base/view_prop.h index 3ce14ba..c81e995 100644 --- a/ui/base/view_prop.h +++ b/ui/base/view_prop.h @@ -5,8 +5,9 @@ #ifndef UI_BASE_VIEW_PROP_H_ #define UI_BASE_VIEW_PROP_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/base/webui/web_ui_util.cc b/ui/base/webui/web_ui_util.cc index f28e748..7c894f6 100644 --- a/ui/base/webui/web_ui_util.cc +++ b/ui/base/webui/web_ui_util.cc @@ -13,6 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/base/webui/web_ui_util.h b/ui/base/webui/web_ui_util.h index bc6137b..c774af9 100644 --- a/ui/base/webui/web_ui_util.h +++ b/ui/base/webui/web_ui_util.h @@ -5,6 +5,8 @@ #ifndef UI_BASE_WEBUI_WEB_UI_UTIL_H_ #define UI_BASE_WEBUI_WEB_UI_UTIL_H_ +#include <stddef.h> + #include <string> #include "base/strings/string_piece.h" diff --git a/ui/base/win/atl_module.h b/ui/base/win/atl_module.h index f677b43..e1468ae 100644 --- a/ui/base/win/atl_module.h +++ b/ui/base/win/atl_module.h @@ -8,7 +8,6 @@ #include <atlbase.h> #include <atlcom.h> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/ui/base/win/foreground_helper.h b/ui/base/win/foreground_helper.h index 8387c13..b5ca5f0 100644 --- a/ui/base/win/foreground_helper.h +++ b/ui/base/win/foreground_helper.h @@ -6,6 +6,7 @@ #define UI_BASE_WIN_FOREGROUND_HELPER_H_ #include "base/logging.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/win/window_impl.h" diff --git a/ui/base/win/hwnd_subclass.cc b/ui/base/win/hwnd_subclass.cc index dd05244..7cc235a 100644 --- a/ui/base/win/hwnd_subclass.cc +++ b/ui/base/win/hwnd_subclass.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" #include "base/stl_util.h" diff --git a/ui/base/win/hwnd_subclass.h b/ui/base/win/hwnd_subclass.h index 983d525..9038617 100644 --- a/ui/base/win/hwnd_subclass.h +++ b/ui/base/win/hwnd_subclass.h @@ -8,6 +8,7 @@ #include <windows.h> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ui_base_export.h" #include "ui/base/view_prop.h" diff --git a/ui/base/win/hwnd_subclass_unittest.cc b/ui/base/win/hwnd_subclass_unittest.cc index 979e138..b811e27 100644 --- a/ui/base/win/hwnd_subclass_unittest.cc +++ b/ui/base/win/hwnd_subclass_unittest.cc @@ -4,7 +4,7 @@ #include "ui/base/win/hwnd_subclass.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/win/window_impl.h" diff --git a/ui/base/win/lock_state.h b/ui/base/win/lock_state.h index be9c912..02a7a2d 100644 --- a/ui/base/win/lock_state.h +++ b/ui/base/win/lock_state.h @@ -5,7 +5,6 @@ #ifndef UI_BASE_WIN_LOCK_STATE_H_ #define UI_BASE_WIN_LOCK_STATE_H_ -#include "base/basictypes.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/win/open_file_name_win.cc b/ui/base/win/open_file_name_win.cc index 5e5b5b4..5c2df41 100644 --- a/ui/base/win/open_file_name_win.cc +++ b/ui/base/win/open_file_name_win.cc @@ -5,6 +5,7 @@ #include "ui/base/win/open_file_name_win.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/win/windows_version.h" diff --git a/ui/base/win/open_file_name_win_unittest.cc b/ui/base/win/open_file_name_win_unittest.cc index e63df7d..36de27f 100644 --- a/ui/base/win/open_file_name_win_unittest.cc +++ b/ui/base/win/open_file_name_win_unittest.cc @@ -4,7 +4,10 @@ #include "ui/base/win/open_file_name_win.h" +#include <stddef.h> + #include "base/files/file_path.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/ui/base/win/scoped_ole_initializer.h b/ui/base/win/scoped_ole_initializer.h index b2e81d2..255a68c 100644 --- a/ui/base/win/scoped_ole_initializer.h +++ b/ui/base/win/scoped_ole_initializer.h @@ -7,7 +7,7 @@ #include <ole2.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/win/window_event_target.h b/ui/base/win/window_event_target.h index 8ec6360..e87b519 100644 --- a/ui/base/win/window_event_target.h +++ b/ui/base/win/window_event_target.h @@ -7,7 +7,6 @@ #include <windows.h> -#include "base/basictypes.h" #include "ui/base/ui_base_export.h" namespace ui { diff --git a/ui/base/x/selection_owner.h b/ui/base/x/selection_owner.h index 7bea5ad..f3bec33 100644 --- a/ui/base/x/selection_owner.h +++ b/ui/base/x/selection_owner.h @@ -5,10 +5,12 @@ #ifndef UI_BASE_X_SELECTION_OWNER_H_ #define UI_BASE_X_SELECTION_OWNER_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/ui/base/x/selection_requestor.h b/ui/base/x/selection_requestor.h index 2e39166..8be12c6 100644 --- a/ui/base/x/selection_requestor.h +++ b/ui/base/x/selection_requestor.h @@ -5,11 +5,13 @@ #ifndef UI_BASE_X_SELECTION_REQUESTOR_H_ #define UI_BASE_X_SELECTION_REQUESTOR_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/event_types.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/ui/base/x/selection_requestor_unittest.cc b/ui/base/x/selection_requestor_unittest.cc index 4095d44..b292f93 100644 --- a/ui/base/x/selection_requestor_unittest.cc +++ b/ui/base/x/selection_requestor_unittest.cc @@ -4,6 +4,9 @@ #include "ui/base/x/selection_requestor.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/ui/base/x/selection_utils.cc b/ui/base/x/selection_utils.cc index cc9afbe..af84c4b 100644 --- a/ui/base/x/selection_utils.cc +++ b/ui/base/x/selection_utils.cc @@ -4,6 +4,8 @@ #include "ui/base/x/selection_utils.h" +#include <stdint.h> + #include <set> #include "base/i18n/icu_string_conversions.h" diff --git a/ui/base/x/selection_utils.h b/ui/base/x/selection_utils.h index 9eca5be..1c4bcbd 100644 --- a/ui/base/x/selection_utils.h +++ b/ui/base/x/selection_utils.h @@ -5,6 +5,7 @@ #ifndef UI_BASE_X_SELECTION_UTILS_H_ #define UI_BASE_X_SELECTION_UTILS_H_ +#include <stddef.h> #include <X11/Xlib.h> // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. @@ -12,7 +13,6 @@ #include <map> -#include "base/basictypes.h" #include "base/memory/ref_counted_memory.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/ui_base_export.h" diff --git a/ui/base/x/x11_foreign_window_manager.cc b/ui/base/x/x11_foreign_window_manager.cc index ded4bfe..4e739d6 100644 --- a/ui/base/x/x11_foreign_window_manager.cc +++ b/ui/base/x/x11_foreign_window_manager.cc @@ -4,6 +4,7 @@ #include "ui/base/x/x11_foreign_window_manager.h" +#include <stddef.h> #include <X11/Xlib.h> #include "base/compiler_specific.h" diff --git a/ui/base/x/x11_foreign_window_manager.h b/ui/base/x/x11_foreign_window_manager.h index a9167b1..55da51e 100644 --- a/ui/base/x/x11_foreign_window_manager.h +++ b/ui/base/x/x11_foreign_window_manager.h @@ -8,8 +8,8 @@ #include <map> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/x/x11_types.h" diff --git a/ui/base/x/x11_menu_list.h b/ui/base/x/x11_menu_list.h index 00c824e..6986f1c 100644 --- a/ui/base/x/x11_menu_list.h +++ b/ui/base/x/x11_menu_list.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/x/x11_types.h" diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index c8bc999..cd79518 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -23,6 +23,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" @@ -34,6 +35,7 @@ #include "base/sys_byteorder.h" #include "base/threading/thread.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkPostConfig.h" diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index d32101f..c3c9c2b 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -11,11 +11,13 @@ // we use a void* for Visual*). The Xlib headers are highly polluting so we try // hard to limit their spread into the rest of the code. +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/event_types.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "ui/base/ui_base_export.h" #include "ui/events/event_constants.h" diff --git a/ui/base/x/x11_util_internal.h b/ui/base/x/x11_util_internal.h index d5c598b..d58eccf 100644 --- a/ui/base/x/x11_util_internal.h +++ b/ui/base/x/x11_util_internal.h @@ -18,6 +18,7 @@ extern "C" { #include <X11/Xlib.h> } +#include "build/build_config.h" #include "ui/base/ui_base_export.h" namespace ui { |