Support the ModemManager1 interfaces for SMS messages

chromeos/dbus/dbus_thread_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_manager_client.h"
 #include "chromeos/dbus/bluetooth_node_client.h"
 #include "chromeos/dbus/cashew_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/flimflam_device_client.h"
 #include "chromeos/dbus/flimflam_ipconfig_client.h"
 #include "chromeos/dbus/flimflam_manager_client.h"
 #include "chromeos/dbus/flimflam_network_client.h"
 #include "chromeos/dbus/flimflam_profile_client.h"
 #include "chromeos/dbus/flimflam_service_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
+#include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/sms_client.h"
 #include "chromeos/dbus/speech_synthesizer_client.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "dbus/bus.h"
 
 namespace chromeos {
 
 static DBusThreadManager* g_dbus_thread_manager = NULL;
 
@@ skipping 55 matching lines @@
         FlimflamManagerClient::Create(client_type, system_bus_.get()));
     // Create the Flimflam Network client.
     flimflam_network_client_.reset(
         FlimflamNetworkClient::Create(client_type, system_bus_.get()));
     // Create the Flimflam Profile client.
     flimflam_profile_client_.reset(
         FlimflamProfileClient::Create(client_type, system_bus_.get()));
     // Create the Flimflam Service client.
     flimflam_service_client_.reset(
         FlimflamServiceClient::Create(client_type, system_bus_.get()));
-    // Create the SMS cilent.
+    // Create the Gsm SMS client.
     gsm_sms_client_.reset(
         GsmSMSClient::Create(client_type, system_bus_.get()));
     // Create the image burner client.
     image_burner_client_.reset(ImageBurnerClient::Create(client_type,
                                                          system_bus_.get()));
     // Create the introspectable object client.
     introspectable_client_.reset(
         IntrospectableClient::Create(client_type, system_bus_.get()));
+    // Create the ModemMessaging client.
+    modem_messaging_client_.reset(
+        ModemMessagingClient::Create(client_type, system_bus_.get()));
     // Create the power manager client.
     power_manager_client_.reset(
         PowerManagerClient::Create(client_type_maybe_stub, system_bus_.get()));
     // Create the session manager client.
     session_manager_client_.reset(
         SessionManagerClient::Create(client_type, system_bus_.get()));
+    // Create the SMS client.
+    sms_client_.reset(
+        SMSClient::Create(client_type, system_bus_.get()));
     // Create the speech synthesizer client.
     speech_synthesizer_client_.reset(
         SpeechSynthesizerClient::Create(client_type, system_bus_.get()));
     // Create the update engine client.
     update_engine_client_.reset(
         UpdateEngineClient::Create(client_type, system_bus_.get()));
   }
 
   virtual ~DBusThreadManagerImpl() {
     // Shut down the bus. During the browser shutdown, it's ok to shut down
@@ skipping 126 matching lines @@
   virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE {
     return image_burner_client_.get();
   }
 
   // DBusThreadManager override.
   virtual IntrospectableClient* GetIntrospectableClient() OVERRIDE {
     return introspectable_client_.get();
   }
 
   // DBusThreadManager override.
+  virtual ModemMessagingClient* GetModemMessagingClient() OVERRIDE {
+    return modem_messaging_client_.get();
+  }
+
+  // DBusThreadManager override.
   virtual PowerManagerClient* GetPowerManagerClient() OVERRIDE {
     return power_manager_client_.get();
   }
 
   // DBusThreadManager override.
   virtual SessionManagerClient* GetSessionManagerClient() OVERRIDE {
     return session_manager_client_.get();
   }
 
   // DBusThreadManager override.
+  virtual SMSClient* GetSMSClient() OVERRIDE {
+    return sms_client_.get();
+  }
+
+  // DBusThreadManager override.
   virtual SpeechSynthesizerClient* GetSpeechSynthesizerClient() OVERRIDE {
     return speech_synthesizer_client_.get();
   }
 
   // DBusThreadManager override.
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
     return update_engine_client_.get();
   }
 
   // DBusThreadManager override.
@@ skipping 20 matching lines @@
   scoped_ptr<DebugDaemonClient> debugdaemon_client_;
   scoped_ptr<FlimflamDeviceClient> flimflam_device_client_;
   scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_;
   scoped_ptr<FlimflamManagerClient> flimflam_manager_client_;
   scoped_ptr<FlimflamNetworkClient> flimflam_network_client_;
   scoped_ptr<FlimflamProfileClient> flimflam_profile_client_;
   scoped_ptr<FlimflamServiceClient> flimflam_service_client_;
   scoped_ptr<GsmSMSClient> gsm_sms_client_;
   scoped_ptr<ImageBurnerClient> image_burner_client_;
   scoped_ptr<IntrospectableClient> introspectable_client_;
+  scoped_ptr<ModemMessagingClient> modem_messaging_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
+  scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
   scoped_ptr<IBusClient> ibus_client_;
   scoped_ptr<IBusInputContextClient> ibus_input_context_client_;
 
   std::string ibus_address_;
 };
 
 // static
 void DBusThreadManager::Initialize() {
@@ skipping 51 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos