| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 | 178 |
| 179 ibus_client_.reset( | 179 ibus_client_.reset( |
| 180 IBusClient::Create(client_type, ibus_bus_.get())); | 180 IBusClient::Create(client_type, ibus_bus_.get())); |
| 181 ibus_config_client_.reset( | 181 ibus_config_client_.reset( |
| 182 IBusConfigClient::Create(client_type, ibus_bus_.get())); | 182 IBusConfigClient::Create(client_type, ibus_bus_.get())); |
| 183 ibus_input_context_client_.reset( | 183 ibus_input_context_client_.reset( |
| 184 IBusInputContextClient::Create(client_type)); | 184 IBusInputContextClient::Create(client_type)); |
| 185 ibus_engine_factory_service_.reset( | 185 ibus_engine_factory_service_.reset( |
| 186 IBusEngineFactoryService::Create(ibus_bus_.get(), client_type)); | 186 IBusEngineFactoryService::Create(ibus_bus_.get(), client_type)); |
| 187 ibus_panel_service_.reset( | 187 ibus_panel_service_.reset( |
| 188 ibus::IBusPanelService::Create(client_type, ibus_bus_.get())); | 188 ibus::IBusPanelService::Create(client_type, |
| 189 ibus_bus_.get(), |
| 190 ibus_input_context_client_.get())); |
| 189 | 191 |
| 190 ibus_engine_services_.clear(); | 192 ibus_engine_services_.clear(); |
| 191 } | 193 } |
| 192 | 194 |
| 193 // DBusThreadManager overrides: | 195 // DBusThreadManager overrides: |
| 194 virtual dbus::Bus* GetSystemBus() OVERRIDE { | 196 virtual dbus::Bus* GetSystemBus() OVERRIDE { |
| 195 return system_bus_.get(); | 197 return system_bus_.get(); |
| 196 } | 198 } |
| 197 | 199 |
| 198 virtual dbus::Bus* GetIBusBus() OVERRIDE { | 200 virtual dbus::Bus* GetIBusBus() OVERRIDE { |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 } | 447 } |
| 446 | 448 |
| 447 // static | 449 // static |
| 448 DBusThreadManager* DBusThreadManager::Get() { | 450 DBusThreadManager* DBusThreadManager::Get() { |
| 449 CHECK(g_dbus_thread_manager) | 451 CHECK(g_dbus_thread_manager) |
| 450 << "DBusThreadManager::Get() called before Initialize()"; | 452 << "DBusThreadManager::Get() called before Initialize()"; |
| 451 return g_dbus_thread_manager; | 453 return g_dbus_thread_manager; |
| 452 } | 454 } |
| 453 | 455 |
| 454 } // namespace chromeos | 456 } // namespace chromeos |
| OLD | NEW |