[shill] move wifi properties into WiFi from Device
Also, ensure that properties in leaf classes (WiFi, Cellular, etc) are
private, not protected.
BUG=chromium-os:16956
TEST=unit tests
Change-Id: I1b94e7dd5fb12a741a7a3a1220678c2d24d6c543
Reviewed-on: http://gerrit.chromium.org/gerrit/3188
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/wifi.h b/wifi.h
index 833f8cf..3d2f2d7 100644
--- a/wifi.h
+++ b/wifi.h
@@ -115,14 +115,19 @@
ScopedRunnableMethodFactory<WiFi> task_factory_;
ControlInterface *control_interface_;
EventDispatcher *dispatcher_;
- DBus::Connection dbus_;
+ scoped_ptr<DBus::Connection> dbus_;
scoped_ptr<SupplicantProcessProxy> supplicant_process_proxy_;
scoped_ptr<SupplicantInterfaceProxy> supplicant_interface_proxy_;
- bool scan_pending_;
- uint16 scan_interval_;
EndpointMap endpoint_by_bssid_;
ServiceMap service_by_private_id_;
+ // Properties
+ std::string bgscan_method_;
+ uint16 bgscan_short_interval_;
+ int32 bgscan_signal_threshold_;
+ bool scan_pending_;
+ uint16 scan_interval_;
+
DISALLOW_COPY_AND_ASSIGN(WiFi);
};