| Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| index dfa55590ca6ef5e9fc0f52a82e2bbe0015b81abb..fbe0d78b1830ca9bc08de1859f2a58d98d367da9 100644
|
| --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| @@ -9,13 +9,9 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/cancelable_callback.h"
|
| -#include "base/prefs/pref_member.h"
|
| -#include "chrome/browser/local_discovery/cloud_device_list.h"
|
| #include "chrome/browser/local_discovery/cloud_print_printer_list.h"
|
| #include "chrome/browser/local_discovery/privet_device_lister.h"
|
| #include "chrome/browser/local_discovery/privet_http.h"
|
| -#include "chrome/browser/local_discovery/privetv3_setup_flow.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
| #include "content/public/browser/web_ui_message_handler.h"
|
|
|
| @@ -23,11 +19,6 @@
|
| #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
|
| #endif
|
|
|
| -#if defined(ENABLE_WIFI_BOOTSTRAPPING)
|
| -#include "chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h"
|
| -#include "chrome/browser/local_discovery/wifi/wifi_manager.h"
|
| -#endif
|
| -
|
| // TODO(noamsml): Factor out full registration flow into single class
|
| namespace local_discovery {
|
|
|
| @@ -42,7 +33,6 @@ class ServiceDiscoverySharedClient;
|
| // into the Javascript to update the page.
|
| class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| public PrivetRegisterOperation::Delegate,
|
| - public PrivetV3SetupFlow::Delegate,
|
| public PrivetDeviceLister::Delegate,
|
| public CloudDeviceListDelegate,
|
| public SigninManagerBase::Observer {
|
| @@ -66,17 +56,6 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| void OnPrivetRegisterDone(PrivetRegisterOperation* operation,
|
| const std::string& device_id) override;
|
|
|
| - // PrivetV3SetupFlow::Delegate implementation.
|
| - scoped_ptr<GCDApiFlow> CreateApiFlow() override;
|
| - void GetWiFiCredentials(const CredentialsCallback& callback) override;
|
| - void SwitchToSetupWiFi(const ResultCallback& callback) override;
|
| - void CreatePrivetV3Client(const std::string& service_name,
|
| - const PrivetClientCallback& callback) override;
|
| - void ConfirmSecurityCode(const ResultCallback& callback) override;
|
| - void RestoreWifi(const ResultCallback& callback) override;
|
| - void OnSetupDone() override;
|
| - void OnSetupError() override;
|
| -
|
| // PrivetDeviceLister::Delegate implementation.
|
| void DeviceChanged(bool added,
|
| const std::string& name,
|
| @@ -97,6 +76,7 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
|
|
| private:
|
| typedef std::map<std::string, DeviceDescription> DeviceDescriptionMap;
|
| + typedef base::Callback<void(bool result)> ResultCallback;
|
|
|
| // Message handlers:
|
| // For when the page is ready to receive device notifications.
|
| @@ -108,9 +88,6 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| // For when a user choice is made.
|
| void HandleRegisterDevice(const base::ListValue* args);
|
|
|
| - // For when a code is confirmed.
|
| - void HandleConfirmCode(const base::ListValue* args);
|
| -
|
| // For when a cancellation is made.
|
| void HandleCancelRegistration(const base::ListValue* args);
|
|
|
| @@ -146,10 +123,8 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| // Reset and cancel the current registration.
|
| void ResetCurrentRegistration();
|
|
|
| - // Creates |PrivetV3HTTPClient| privet from |PrivetHTTPClient| and calls
|
| - // callback.
|
| - void PrivetClientToV3(const PrivetClientCallback& callback,
|
| - scoped_ptr<PrivetHTTPClient> client);
|
| + scoped_ptr<GCDApiFlow> CreateApiFlow();
|
| + void OnSetupError();
|
|
|
| // Announcement hasn't been sent for a certain time after registration
|
| // finished. Consider it failed.
|
| @@ -172,13 +147,6 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| void RefreshCloudPrintStatusFromService();
|
| #endif
|
|
|
| -#if defined(ENABLE_WIFI_BOOTSTRAPPING)
|
| - void StartWifiBootstrapping();
|
| - void OnBootstrappingDeviceChanged(
|
| - bool available,
|
| - const wifi::BootstrappingDeviceDescription& description);
|
| -#endif
|
| -
|
| // A map of current device descriptions provided by the PrivetDeviceLister.
|
| DeviceDescriptionMap device_descriptions_;
|
|
|
| @@ -197,9 +165,6 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| // The current register operation. Only one allowed at any time.
|
| scoped_ptr<PrivetRegisterOperation> current_register_operation_;
|
|
|
| - // The current Privet v3 setup operation. Only one allowed at any time.
|
| - scoped_ptr<PrivetV3SetupFlow> current_setup_operation_;
|
| -
|
| // The current confirm call used during the registration flow.
|
| scoped_ptr<GCDApiFlow> confirm_api_call_flow_;
|
|
|
| @@ -211,11 +176,9 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
|
|
| // List of printers from cloud print.
|
| scoped_ptr<GCDApiFlow> cloud_print_printer_list_;
|
| - scoped_ptr<GCDApiFlow> cloud_device_list_;
|
| std::vector<Device> cloud_devices_;
|
| int failed_list_count_;
|
| int succeded_list_count_;
|
| - ResultCallback device_code_callback_;
|
|
|
| #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
|
| StringPrefMember cloud_print_connector_email_;
|
| @@ -223,11 +186,6 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| bool cloud_print_connector_ui_enabled_;
|
| #endif
|
|
|
| -#if defined(ENABLE_WIFI_BOOTSTRAPPING)
|
| - scoped_ptr<wifi::WifiManager> wifi_manager_;
|
| - scoped_ptr<wifi::BootstrappingDeviceLister> bootstrapping_device_lister_;
|
| -#endif
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(LocalDiscoveryUIHandler);
|
| };
|
|
|
|
|