summaryrefslogtreecommitdiffstats
path: root/ui/base/clipboard
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2014-10-20 20:29:40 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 03:32:00 +0000
commitb846e0a2ef3ad964a1781185cac416212a6e1b48 (patch)
tree3c3d194ad5f66f826fd561eeb5f5d7f5eccd3faa /ui/base/clipboard
parent91345e19938b191ee3afc14cf6656b9ba8edd330 (diff)
downloadchromium_src-b846e0a2ef3ad964a1781185cac416212a6e1b48.zip
chromium_src-b846e0a2ef3ad964a1781185cac416212a6e1b48.tar.gz
chromium_src-b846e0a2ef3ad964a1781185cac416212a6e1b48.tar.bz2
Type conversion fixes, ui/ edition.
This is mostly to fix MSVC warnings about possible value truncation. BUG=81439 TEST=none Review URL: https://codereview.chromium.org/660173002 Cr-Commit-Position: refs/heads/master@{#300412}
Diffstat (limited to 'ui/base/clipboard')
-rw-r--r--ui/base/clipboard/clipboard_win.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index b269351..f37f077 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -192,7 +192,7 @@ Clipboard::FormatType::FormatType() : data_() {}
Clipboard::FormatType::FormatType(UINT native_format) : data_() {
// There's no good way to actually initialize this in the constructor in
// C++03.
- data_.cfFormat = native_format;
+ data_.cfFormat = static_cast<CLIPFORMAT>(native_format);
data_.dwAspect = DVASPECT_CONTENT;
data_.lindex = -1;
data_.tymed = TYMED_HGLOBAL;
@@ -201,7 +201,7 @@ Clipboard::FormatType::FormatType(UINT native_format) : data_() {
Clipboard::FormatType::FormatType(UINT native_format, LONG index) : data_() {
// There's no good way to actually initialize this in the constructor in
// C++03.
- data_.cfFormat = native_format;
+ data_.cfFormat = static_cast<CLIPFORMAT>(native_format);
data_.dwAspect = DVASPECT_CONTENT;
data_.lindex = index;
data_.tymed = TYMED_HGLOBAL;