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 "chrome/browser/chromeos/cros/sms_watcher.h" | 5 #include "chromeos/network/sms_watcher.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <deque> | 8 #include <deque> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chromeos/dbus/dbus_thread_manager.h" | 14 #include "chromeos/dbus/dbus_thread_manager.h" |
15 #include "chromeos/dbus/shill_device_client.h" | |
16 #include "chromeos/dbus/gsm_sms_client.h" | 15 #include "chromeos/dbus/gsm_sms_client.h" |
17 #include "chromeos/dbus/modem_messaging_client.h" | 16 #include "chromeos/dbus/modem_messaging_client.h" |
| 17 #include "chromeos/dbus/shill_device_client.h" |
18 #include "chromeos/dbus/sms_client.h" | 18 #include "chromeos/dbus/sms_client.h" |
19 #include "third_party/cros_system_api/dbus/service_constants.h" | 19 #include "third_party/cros_system_api/dbus/service_constants.h" |
20 | 20 |
21 namespace chromeos { | 21 namespace chromeos { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 int decode_bcd(const char *s) { | 25 int decode_bcd(const char *s) { |
26 return (s[0] - '0') * 10 + s[1] - '0'; | 26 return (s[0] - '0') * 10 + s[1] - '0'; |
27 } | 27 } |
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 new ModemManager1Watcher(device_path_, callback_, dbus_connection, | 400 new ModemManager1Watcher(device_path_, callback_, dbus_connection, |
401 dbus::ObjectPath(object_path_string))); | 401 dbus::ObjectPath(object_path_string))); |
402 } else { | 402 } else { |
403 watcher_.reset( | 403 watcher_.reset( |
404 new GsmWatcher(device_path_, callback_, dbus_connection, | 404 new GsmWatcher(device_path_, callback_, dbus_connection, |
405 dbus::ObjectPath(object_path_string))); | 405 dbus::ObjectPath(object_path_string))); |
406 } | 406 } |
407 } | 407 } |
408 | 408 |
409 } // namespace chromeos | 409 } // namespace chromeos |
OLD | NEW |