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

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

Issue 2284003002: Revert of IME for Mus: Make InputMethodMus use the IME Mojo API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 gpu_proxy_.reset(new GpuServiceProxy()); 181 gpu_proxy_.reset(new GpuServiceProxy());
182 182
183 // Gpu must be running before the PlatformScreen can be initialized. 183 // Gpu must be running before the PlatformScreen can be initialized.
184 window_server_.reset(new ws::WindowServer(this)); 184 window_server_.reset(new ws::WindowServer(this));
185 185
186 // DeviceDataManager must be initialized before TouchController. On non-Linux 186 // DeviceDataManager must be initialized before TouchController. On non-Linux
187 // platforms there is no DeviceDataManager so don't create touch controller. 187 // platforms there is no DeviceDataManager so don't create touch controller.
188 if (ui::DeviceDataManager::HasInstance()) 188 if (ui::DeviceDataManager::HasInstance())
189 touch_controller_.reset( 189 touch_controller_.reset(
190 new ws::TouchController(window_server_->display_manager())); 190 new ws::TouchController(window_server_->display_manager()));
191
192 ime_server_.Init(connector());
193 } 191 }
194 192
195 bool Service::OnConnect(const shell::Identity& remote_identity, 193 bool Service::OnConnect(const shell::Identity& remote_identity,
196 shell::InterfaceRegistry* registry) { 194 shell::InterfaceRegistry* registry) {
197 registry->AddInterface<mojom::AccessibilityManager>(this); 195 registry->AddInterface<mojom::AccessibilityManager>(this);
198 registry->AddInterface<mojom::Clipboard>(this); 196 registry->AddInterface<mojom::Clipboard>(this);
199 registry->AddInterface<mojom::DisplayManager>(this); 197 registry->AddInterface<mojom::DisplayManager>(this);
200 registry->AddInterface<mojom::GpuService>(this); 198 registry->AddInterface<mojom::GpuService>(this);
201 registry->AddInterface<mojom::IMERegistrar>(this); 199 registry->AddInterface<mojom::IMERegistrar>(this);
202 registry->AddInterface<mojom::IMEServer>(this); 200 registry->AddInterface<mojom::IMEServer>(this);
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 346
349 void Service::Create(const shell::Identity& remote_identity, 347 void Service::Create(const shell::Identity& remote_identity,
350 mojom::WindowServerTestRequest request) { 348 mojom::WindowServerTestRequest request) {
351 if (!test_config_) 349 if (!test_config_)
352 return; 350 return;
353 new ws::WindowServerTestImpl(window_server_.get(), std::move(request)); 351 new ws::WindowServerTestImpl(window_server_.get(), std::move(request));
354 } 352 }
355 353
356 354
357 } // namespace ui 355 } // 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