OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "services/ui/ime/test_ime_driver/test_ime_application.h" | 5 #include "services/ui/ime/test_ime_driver/test_ime_application.h" |
6 | 6 |
| 7 #include "mojo/public/cpp/bindings/strong_binding.h" |
7 #include "services/shell/public/cpp/connector.h" | 8 #include "services/shell/public/cpp/connector.h" |
8 #include "services/ui/ime/test_ime_driver/test_ime_driver.h" | 9 #include "services/ui/ime/test_ime_driver/test_ime_driver.h" |
9 #include "services/ui/public/interfaces/ime.mojom.h" | 10 #include "services/ui/public/interfaces/ime.mojom.h" |
10 | 11 |
11 namespace ui { | 12 namespace ui { |
12 namespace test { | 13 namespace test { |
13 | 14 |
14 TestIMEApplication::TestIMEApplication() {} | 15 TestIMEApplication::TestIMEApplication() {} |
15 | 16 |
16 TestIMEApplication::~TestIMEApplication() {} | 17 TestIMEApplication::~TestIMEApplication() {} |
17 | 18 |
18 bool TestIMEApplication::OnConnect(const shell::Identity& remote_identity, | 19 bool TestIMEApplication::OnConnect(const shell::Identity& remote_identity, |
19 shell::InterfaceRegistry* registry) { | 20 shell::InterfaceRegistry* registry) { |
20 return true; | 21 return true; |
21 } | 22 } |
22 | 23 |
23 void TestIMEApplication::OnStart(const shell::Identity& identity) { | 24 void TestIMEApplication::OnStart(const shell::Identity& identity) { |
24 mojom::IMEDriverPtr ime_driver_ptr; | 25 mojom::IMEDriverPtr ime_driver_ptr; |
25 new TestIMEDriver(GetProxy(&ime_driver_ptr)); | 26 mojo::MakeStrongBinding(base::MakeUnique<TestIMEDriver>(), |
| 27 GetProxy(&ime_driver_ptr)); |
26 | 28 |
27 ui::mojom::IMERegistrarPtr ime_registrar; | 29 ui::mojom::IMERegistrarPtr ime_registrar; |
28 connector()->ConnectToInterface("mojo:ui", &ime_registrar); | 30 connector()->ConnectToInterface("mojo:ui", &ime_registrar); |
29 ime_registrar->RegisterDriver(std::move(ime_driver_ptr)); | 31 ime_registrar->RegisterDriver(std::move(ime_driver_ptr)); |
30 } | 32 } |
31 | 33 |
32 } // namespace test | 34 } // namespace test |
33 } // namespace ui | 35 } // namespace ui |
OLD | NEW |