| Index: remoting/host/clipboard_win.cc
|
| diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc
|
| index cc504bad231edeeaa64545135275b7f6ed1ef3da..dbc7a3c19f841cc537e75c3896053f4bd5382e25 100644
|
| --- a/remoting/host/clipboard_win.cc
|
| +++ b/remoting/host/clipboard_win.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/win/windows_version.h"
|
| #include "base/win/wrapped_window_proc.h"
|
| #include "remoting/base/constants.h"
|
| +#include "remoting/host/clipboard_util.h"
|
| #include "remoting/proto/event.pb.h"
|
| #include "remoting/protocol/clipboard_stub.h"
|
|
|
| @@ -202,7 +203,7 @@ void ClipboardWin::InjectClipboardEvent(
|
| if (event.mime_type().compare(kMimeTypeTextUtf8)) {
|
| return;
|
| }
|
| - string16 text = UTF8ToUTF16(event.data());
|
| + string16 text = UTF8ToUTF16(ClipboardUtil::ReplaceLfByCrLf(event.data()));
|
|
|
| ScopedClipboard clipboard;
|
| if (!clipboard.Init(hwnd_)) {
|
| @@ -259,7 +260,7 @@ void ClipboardWin::OnClipboardUpdate() {
|
|
|
| protocol::ClipboardEvent event;
|
| event.set_mime_type(kMimeTypeTextUtf8);
|
| - event.set_data(UTF16ToUTF8(text));
|
| + event.set_data(ClipboardUtil::ReplaceCrLfByLf(UTF16ToUTF8(text)));
|
|
|
| if (client_clipboard_.get()) {
|
| client_clipboard_->InjectClipboardEvent(event);
|
|
|