summaryrefslogtreecommitdiffstats
path: root/mojo/services/native_viewport/native_viewport_impl.cc
diff options
context:
space:
mode:
authormpcomplete <mpcomplete@chromium.org>2014-09-02 17:05:23 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-03 00:26:03 +0000
commit278d42a659161b96461b27e166d44224da697eaa (patch)
treee070d4b6d5a42c73921389139a9df025a40b3b9f /mojo/services/native_viewport/native_viewport_impl.cc
parentdc3e49849ab91ae24be3dfd1e7e1deb6138147c6 (diff)
downloadchromium_src-278d42a659161b96461b27e166d44224da697eaa.zip
chromium_src-278d42a659161b96461b27e166d44224da697eaa.tar.gz
chromium_src-278d42a659161b96461b27e166d44224da697eaa.tar.bz2
Change TypeConverter<X,Y>::ConvertFrom and ConvertTo into a single symmetric
Convert method. Also added a ConvertTo<X> helper function. Also changed it from class to struct, since every method was public. BUG=406492 Review URL: https://codereview.chromium.org/507173003 Cr-Commit-Position: refs/heads/master@{#293027}
Diffstat (limited to 'mojo/services/native_viewport/native_viewport_impl.cc')
-rw-r--r--mojo/services/native_viewport/native_viewport_impl.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/mojo/services/native_viewport/native_viewport_impl.cc b/mojo/services/native_viewport/native_viewport_impl.cc
index 9d6ff23..47de692 100644
--- a/mojo/services/native_viewport/native_viewport_impl.cc
+++ b/mojo/services/native_viewport/native_viewport_impl.cc
@@ -118,9 +118,8 @@ bool NativeViewportImpl::OnEvent(ui::Event* ui_event) {
return false;
client()->OnEvent(
- TypeConverter<EventPtr, ui::Event>::ConvertFrom(*ui_event),
- base::Bind(&NativeViewportImpl::AckEvent,
- weak_factory_.GetWeakPtr()));
+ Event::From(*ui_event),
+ base::Bind(&NativeViewportImpl::AckEvent, weak_factory_.GetWeakPtr()));
waiting_for_event_ack_ = true;
return false;
}