Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: ui/base/clipboard/clipboard_win.cc

Issue 660173002: Type conversion fixes, ui/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/accelerators/accelerator.cc ('k') | ui/base/ime/input_method_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_win.cc
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index b269351f1ee5232e40b092cd1a093023af298b10..f37f0772cadf2912f9c26ea0520d041e99e9cbb7 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;
« no previous file with comments | « ui/base/accelerators/accelerator.cc ('k') | ui/base/ime/input_method_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698