commit 62028b2ae0517c4b82180cbb826fa7a6b66f9ce4
author Ben Chan <benchan@chromium.org> Mon Nov 05 11:20:02 2012 -0800
committer Gerrit <chrome-bot@google.com> Mon Nov 05 14:38:36 2012 -0800
tree 5bd25b9816d9e854f4a6e5e2a1d15e1bb3449acd
parent d7479f1303d16afdb3a02e2faa25db3dd5d866f1

shill: cellular: Instantiate and propagate CellularOperatorInfo object.

BUG=chrome-os-partner:11985
TEST=Build and run unit tests.

Change-Id: I7bf5d20a15eefe18f92951780f059bf5559bba5d
Reviewed-on: https://gerrit.chromium.org/gerrit/37362
Reviewed-by: Thieu Le <thieule@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

modem_manager.h

diff --git a/modem_manager.h b/modem_manager.h
index ad5d3ae..89f6b40 100644
--- a/modem_manager.h
+++ b/modem_manager.h
@@ -23,8 +23,8 @@
 
 namespace shill {
 
+class CellularOperatorInfo;
 class ControlInterface;
-
 class DBusObjectManagerProxyInterface;
 class DBusPropertiesProxyInterface;
 class EventDispatcher;
@@ -46,6 +46,7 @@
                Metrics *metrics,
                Manager *manager,
                GLib *glib,
+               CellularOperatorInfo *cellular_operator_info_,
                mobile_provider_db *provider_db);
   virtual ~ModemManager();
 
@@ -69,6 +70,9 @@
   const std::string &service() const { return service_; }
   const std::string &path() const { return path_; }
   ProxyFactory *proxy_factory() const { return proxy_factory_; }
+  CellularOperatorInfo *cellular_operator_info() const {
+    return cellular_operator_info_;
+  }
   mobile_provider_db *provider_db() const { return provider_db_; }
 
   // Connect/Disconnect to a modem manager service.
@@ -126,6 +130,7 @@
   Metrics *metrics_;
   Manager *manager_;
   GLib *glib_;
+  CellularOperatorInfo *cellular_operator_info_;
   mobile_provider_db *provider_db_;
 
   DISALLOW_COPY_AND_ASSIGN(ModemManager);
@@ -140,6 +145,7 @@
                       Metrics *metrics,
                       Manager *manager,
                       GLib *glib,
+                      CellularOperatorInfo *cellular_operator_info,
                       mobile_provider_db *provider_db);
 
   virtual ~ModemManagerClassic();
@@ -173,6 +179,7 @@
                 Metrics *metrics,
                 Manager *manager,
                 GLib *glib,
+                CellularOperatorInfo *cellular_operator_info,
                 mobile_provider_db *provider_db);
 
   virtual ~ModemManager1();