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

Side by Side Diff: services/ui/service.cc

Issue 2230393002: IME for Mus: Make InputMethodMus use the IME Mojo API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update mash_browser_tests_manifest. Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « services/ui/public/interfaces/ime.mojom ('k') | ui/views/mus/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/service.h" 5 #include "services/ui/service.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 input_device_server_.RegisterAsObserver(); 180 input_device_server_.RegisterAsObserver();
181 181
182 // Gpu must be running before the PlatformScreen can be initialized. 182 // Gpu must be running before the PlatformScreen can be initialized.
183 window_server_.reset(new ws::WindowServer(this)); 183 window_server_.reset(new ws::WindowServer(this));
184 184
185 // DeviceDataManager must be initialized before TouchController. On non-Linux 185 // DeviceDataManager must be initialized before TouchController. On non-Linux
186 // platforms there is no DeviceDataManager so don't create touch controller. 186 // platforms there is no DeviceDataManager so don't create touch controller.
187 if (ui::DeviceDataManager::HasInstance()) 187 if (ui::DeviceDataManager::HasInstance())
188 touch_controller_.reset( 188 touch_controller_.reset(
189 new ws::TouchController(window_server_->display_manager())); 189 new ws::TouchController(window_server_->display_manager()));
190
191 ime_server_.Init(connector());
190 } 192 }
191 193
192 bool Service::OnConnect(const shell::Identity& remote_identity, 194 bool Service::OnConnect(const shell::Identity& remote_identity,
193 shell::InterfaceRegistry* registry) { 195 shell::InterfaceRegistry* registry) {
194 registry->AddInterface<mojom::AccessibilityManager>(this); 196 registry->AddInterface<mojom::AccessibilityManager>(this);
195 registry->AddInterface<mojom::Clipboard>(this); 197 registry->AddInterface<mojom::Clipboard>(this);
196 registry->AddInterface<mojom::DisplayManager>(this); 198 registry->AddInterface<mojom::DisplayManager>(this);
197 registry->AddInterface<mojom::GpuService>(this); 199 registry->AddInterface<mojom::GpuService>(this);
198 registry->AddInterface<mojom::IMERegistrar>(this); 200 registry->AddInterface<mojom::IMERegistrar>(this);
199 registry->AddInterface<mojom::IMEServer>(this); 201 registry->AddInterface<mojom::IMEServer>(this);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 349
348 void Service::Create(const shell::Identity& remote_identity, 350 void Service::Create(const shell::Identity& remote_identity,
349 mojom::WindowServerTestRequest request) { 351 mojom::WindowServerTestRequest request) {
350 if (!test_config_) 352 if (!test_config_)
351 return; 353 return;
352 new ws::WindowServerTestImpl(window_server_.get(), std::move(request)); 354 new ws::WindowServerTestImpl(window_server_.get(), std::move(request));
353 } 355 }
354 356
355 357
356 } // namespace ui 358 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/interfaces/ime.mojom ('k') | ui/views/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698