OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chromeos/dbus/dbus_thread_manager.h" | 5 #include "chromeos/dbus/dbus_thread_manager.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/chromeos/chromeos_version.h" | 9 #include "base/chromeos/chromeos_version.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 } | 309 } |
310 | 310 |
311 virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE { | 311 virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE { |
312 return ibus_engine_factory_service_.get(); | 312 return ibus_engine_factory_service_.get(); |
313 } | 313 } |
314 | 314 |
315 virtual IBusEngineService* GetIBusEngineService( | 315 virtual IBusEngineService* GetIBusEngineService( |
316 const dbus::ObjectPath& object_path) OVERRIDE { | 316 const dbus::ObjectPath& object_path) OVERRIDE { |
317 if (ibus_engine_services_.find(object_path) | 317 if (ibus_engine_services_.find(object_path) |
318 == ibus_engine_services_.end()) { | 318 == ibus_engine_services_.end()) { |
319 ibus_engine_services_[object_path] = | 319 ibus_engine_services_[object_path] = IBusEngineService::Create(); |
320 IBusEngineService::Create(STUB_DBUS_CLIENT_IMPLEMENTATION, | |
321 ibus_bus_.get(), object_path); | |
322 } | 320 } |
323 return ibus_engine_services_[object_path]; | 321 return ibus_engine_services_[object_path]; |
324 } | 322 } |
325 | 323 |
326 virtual void RemoveIBusEngineService( | 324 virtual void RemoveIBusEngineService( |
327 const dbus::ObjectPath& object_path) OVERRIDE { | 325 const dbus::ObjectPath& object_path) OVERRIDE { |
328 if (ibus_engine_services_.find(object_path) != | 326 if (ibus_engine_services_.find(object_path) != |
329 ibus_engine_services_.end()) { | 327 ibus_engine_services_.end()) { |
330 LOG(WARNING) << "Object path not found: " << object_path.value(); | 328 LOG(WARNING) << "Object path not found: " << object_path.value(); |
331 return; | 329 return; |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 } | 502 } |
505 | 503 |
506 // static | 504 // static |
507 DBusThreadManager* DBusThreadManager::Get() { | 505 DBusThreadManager* DBusThreadManager::Get() { |
508 CHECK(g_dbus_thread_manager) | 506 CHECK(g_dbus_thread_manager) |
509 << "DBusThreadManager::Get() called before Initialize()"; | 507 << "DBusThreadManager::Get() called before Initialize()"; |
510 return g_dbus_thread_manager; | 508 return g_dbus_thread_manager; |
511 } | 509 } |
512 | 510 |
513 } // namespace chromeos | 511 } // namespace chromeos |
OLD | NEW |