commit 505c413229027b6e44ef4a6d7b6b9db6fad9881d
author Vitaly Buka <vitalybuka@chromium.org> Tue Jun 09 17:01:54 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sat Jun 13 01:25:39 2015 +0000
tree 67acf861cfed2e0e9090468209c6d1cecc698742
parent 494b06f050c280c0616d3bf647f90a011c900d38

buffet: Add same as privetd D-Bus methods and properties

We are moving privet code into buffet.

BUG=brillo:1161
TEST=`FEATURES=test emerge-gizmo buffet`

Change-Id: I49993ed66f40d828d046dd5b2c7c44edfc394276
Reviewed-on: https://chromium-review.googlesource.com/276601
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>

buffet/manager.h

diff --git a/buffet/manager.h b/buffet/manager.h
index 35e6e25..781fa03 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -22,6 +22,8 @@
 #include "buffet/commands/command_manager.h"
 #include "buffet/device_registration_info.h"
 #include "buffet/org.chromium.Buffet.Manager.h"
+#include "buffet/privet/privet_manager.h"
+#include "buffet/privet/wifi_bootstrap_manager.h"
 
 namespace chromeos {
 namespace dbus_utils {
@@ -86,11 +88,26 @@
       const std::vector<std::string>& in_names,
       const std::string& in_visibility) override;
   std::string TestMethod(const std::string& message) override;
+  bool EnableWiFiBootstrapping(
+      chromeos::ErrorPtr* error,
+      const dbus::ObjectPath& in_listener_path,
+      const chromeos::VariantDictionary& in_options) override;
+  bool DisableWiFiBootstrapping(chromeos::ErrorPtr* error) override;
+  bool EnableGCDBootstrapping(
+      chromeos::ErrorPtr* error,
+      const dbus::ObjectPath& in_listener_path,
+      const chromeos::VariantDictionary& in_options) override;
+  bool DisableGCDBootstrapping(chromeos::ErrorPtr* error) override;
 
   void OnCommandDefsChanged();
   void OnStateChanged();
   void OnRegistrationChanged(RegistrationStatus status);
   void OnConfigChanged(const BuffetConfig& config);
+  void UpdateWiFiBootstrapState(privetd::WifiBootstrapManager::State state);
+  void OnPairingStart(const std::string& session_id,
+                      privetd::PairingType pairing_type,
+                      const std::vector<uint8_t>& code);
+  void OnPairingEnd(const std::string& session_id);
 
   org::chromium::Buffet::ManagerAdaptor dbus_adaptor_{this};
   chromeos::dbus_utils::DBusObject dbus_object_;