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

Side by Side Diff: chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

Issue 23680003: Delete IBusPanelService from DBusThreadManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed the codebase. Created 7 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 | « chromeos/dbus/mock_dbus_thread_manager_without_gmock.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/mock_dbus_thread_manager_without_gmock.h" 5 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
6 6
7 #include "chromeos/dbus/dbus_thread_manager_observer.h" 7 #include "chromeos/dbus/dbus_thread_manager_observer.h"
8 #include "chromeos/dbus/fake_bluetooth_adapter_client.h" 8 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
9 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h" 9 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
10 #include "chromeos/dbus/fake_bluetooth_device_client.h" 10 #include "chromeos/dbus/fake_bluetooth_device_client.h"
11 #include "chromeos/dbus/fake_bluetooth_input_client.h" 11 #include "chromeos/dbus/fake_bluetooth_input_client.h"
12 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h" 12 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
13 #include "chromeos/dbus/fake_cros_disks_client.h" 13 #include "chromeos/dbus/fake_cros_disks_client.h"
14 #include "chromeos/dbus/fake_cryptohome_client.h" 14 #include "chromeos/dbus/fake_cryptohome_client.h"
15 #include "chromeos/dbus/fake_gsm_sms_client.h" 15 #include "chromeos/dbus/fake_gsm_sms_client.h"
16 #include "chromeos/dbus/fake_image_burner_client.h" 16 #include "chromeos/dbus/fake_image_burner_client.h"
17 #include "chromeos/dbus/fake_power_manager_client.h" 17 #include "chromeos/dbus/fake_power_manager_client.h"
18 #include "chromeos/dbus/fake_session_manager_client.h" 18 #include "chromeos/dbus/fake_session_manager_client.h"
19 #include "chromeos/dbus/fake_shill_device_client.h" 19 #include "chromeos/dbus/fake_shill_device_client.h"
20 #include "chromeos/dbus/fake_shill_manager_client.h" 20 #include "chromeos/dbus/fake_shill_manager_client.h"
21 #include "chromeos/dbus/fake_system_clock_client.h" 21 #include "chromeos/dbus/fake_system_clock_client.h"
22 #include "chromeos/dbus/fake_update_engine_client.h" 22 #include "chromeos/dbus/fake_update_engine_client.h"
23 #include "chromeos/dbus/ibus/mock_ibus_client.h" 23 #include "chromeos/dbus/ibus/mock_ibus_client.h"
24 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h" 24 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
25 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h" 25 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
26 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h" 26 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
27 #include "chromeos/dbus/ibus/mock_ibus_panel_service.h"
28 #include "chromeos/dbus/power_policy_controller.h" 27 #include "chromeos/dbus/power_policy_controller.h"
29 28
30 namespace chromeos { 29 namespace chromeos {
31 30
32 MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock() 31 MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock()
33 : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient()), 32 : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient()),
34 fake_bluetooth_agent_manager_client_(new FakeBluetoothAgentManagerClient()), 33 fake_bluetooth_agent_manager_client_(new FakeBluetoothAgentManagerClient()),
35 fake_bluetooth_device_client_(new FakeBluetoothDeviceClient()), 34 fake_bluetooth_device_client_(new FakeBluetoothDeviceClient()),
36 fake_bluetooth_input_client_(new FakeBluetoothInputClient()), 35 fake_bluetooth_input_client_(new FakeBluetoothInputClient()),
37 fake_bluetooth_profile_manager_client_( 36 fake_bluetooth_profile_manager_client_(
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 69
71 void MockDBusThreadManagerWithoutGMock::InitIBusBus( 70 void MockDBusThreadManagerWithoutGMock::InitIBusBus(
72 const std::string& ibus_address, 71 const std::string& ibus_address,
73 const base::Closure& closure) { 72 const base::Closure& closure) {
74 // Non-null bus address is used to ensure the connection to ibus-daemon. 73 // Non-null bus address is used to ensure the connection to ibus-daemon.
75 ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef); 74 ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef);
76 mock_ibus_client_.reset(new MockIBusClient); 75 mock_ibus_client_.reset(new MockIBusClient);
77 mock_ibus_input_context_client_.reset(new MockIBusInputContextClient); 76 mock_ibus_input_context_client_.reset(new MockIBusInputContextClient);
78 mock_ibus_engine_service_.reset(new MockIBusEngineService); 77 mock_ibus_engine_service_.reset(new MockIBusEngineService);
79 mock_ibus_engine_factory_service_.reset(new MockIBusEngineFactoryService); 78 mock_ibus_engine_factory_service_.reset(new MockIBusEngineFactoryService);
80 mock_ibus_panel_service_.reset(new MockIBusPanelService);
81 } 79 }
82 80
83 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() { 81 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() {
84 return NULL; 82 return NULL;
85 } 83 }
86 84
87 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetIBusBus() { 85 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetIBusBus() {
88 return ibus_bus_; 86 return ibus_bus_;
89 } 87 }
90 88
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 225
228 IBusEngineService* MockDBusThreadManagerWithoutGMock::GetIBusEngineService( 226 IBusEngineService* MockDBusThreadManagerWithoutGMock::GetIBusEngineService(
229 const dbus::ObjectPath& object_path) { 227 const dbus::ObjectPath& object_path) {
230 return mock_ibus_engine_service_.get(); 228 return mock_ibus_engine_service_.get();
231 } 229 }
232 230
233 void MockDBusThreadManagerWithoutGMock::RemoveIBusEngineService( 231 void MockDBusThreadManagerWithoutGMock::RemoveIBusEngineService(
234 const dbus::ObjectPath& object_path) { 232 const dbus::ObjectPath& object_path) {
235 } 233 }
236 234
237 IBusPanelService* MockDBusThreadManagerWithoutGMock::GetIBusPanelService() {
238 return mock_ibus_panel_service_.get();
239 }
240
241 } // namespace chromeos 235 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/mock_dbus_thread_manager_without_gmock.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698