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/clipboard/clipboard_win.cc | |
| 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/clipboard/clipboard_win.cc')
| -rw-r--r-- | ui/base/clipboard/clipboard_win.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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 { |