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 "chrome/browser/ui/views/ime_driver/ime_driver_mus.h" | 5 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
8 #include "content/public/common/service_manager_connection.h" | 9 #include "content/public/common/service_manager_connection.h" |
9 #include "mojo/public/cpp/bindings/strong_binding.h" | 10 #include "mojo/public/cpp/bindings/strong_binding.h" |
10 #include "services/service_manager/public/cpp/connector.h" | 11 #include "services/service_manager/public/cpp/connector.h" |
11 #include "services/ui/public/interfaces/constants.mojom.h" | 12 #include "services/ui/public/interfaces/constants.mojom.h" |
12 #include "services/ui/public/interfaces/ime/ime.mojom.h" | 13 #include "services/ui/public/interfaces/ime/ime.mojom.h" |
13 #include "ui/base/ime/ime_bridge.h" | 14 #include "ui/base/ime/ime_bridge.h" |
14 | 15 |
15 #if defined(OS_CHROMEOS) | 16 #if defined(OS_CHROMEOS) |
16 #include "chrome/browser/ui/views/ime_driver/input_method_bridge_chromeos.h" | 17 #include "chrome/browser/ui/views/ime_driver/input_method_bridge_chromeos.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #else | 50 #else |
50 input_method_bindings_[session_id] = | 51 input_method_bindings_[session_id] = |
51 base::MakeUnique<mojo::Binding<ui::mojom::InputMethod>>( | 52 base::MakeUnique<mojo::Binding<ui::mojom::InputMethod>>( |
52 new SimpleInputMethod()); | 53 new SimpleInputMethod()); |
53 #endif | 54 #endif |
54 } | 55 } |
55 | 56 |
56 void IMEDriver::CancelSession(int32_t session_id) { | 57 void IMEDriver::CancelSession(int32_t session_id) { |
57 input_method_bindings_.erase(session_id); | 58 input_method_bindings_.erase(session_id); |
58 } | 59 } |
OLD | NEW |