Added new GCD/Privet interfaces.

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_HANDLER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 34 matching lines @@
                                 public CloudDeviceListDelegate,
                                 public SigninManagerBase::Observer {
  public:
   LocalDiscoveryUIHandler();
   virtual ~LocalDiscoveryUIHandler();
 
   static bool GetHasVisible();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
-
   // PrivetRegisterOperation::Delegate implementation.
   virtual void OnPrivetRegisterClaimToken(
       PrivetRegisterOperation* operation,
       const std::string& token,
       const GURL& url) OVERRIDE;
-
   virtual void OnPrivetRegisterError(
       PrivetRegisterOperation* operation,
       const std::string& action,
       PrivetRegisterOperation::FailureReason reason,
       int printer_http_code,
       const base::DictionaryValue* json) OVERRIDE;
-
   virtual void OnPrivetRegisterDone(
       PrivetRegisterOperation* operation,
       const std::string& device_id) OVERRIDE;
 
   // PrivetDeviceLister::Delegate implementation.
   virtual void DeviceChanged(bool added,
                              const std::string& name,
                              const DeviceDescription& description) OVERRIDE;
-
   virtual void DeviceRemoved(const std::string& name) OVERRIDE;
-
   virtual void DeviceCacheFlushed() OVERRIDE;
 
   // CloudDeviceListDelegate implementation.
   virtual void OnDeviceListReady(const std::vector<Device>& devices) OVERRIDE;
   virtual void OnDeviceListUnavailable() OVERRIDE;
 
   // SigninManagerBase::Observer implementation.
   virtual void GoogleSigninSucceeded(const std::string& username,
                                      const std::string& password) OVERRIDE;
-
   virtual void GoogleSignedOut(const std::string& username) OVERRIDE;
 
  private:
   typedef std::map<std::string, DeviceDescription> DeviceDescriptionMap;
 
   // Message handlers:
   // For when the page is ready to receive device notifications.
   void HandleStart(const base::ListValue* args);
 
   // For when a visibility change occurs.
@@ skipping 13 matching lines @@
   void HandleOpenCloudPrintURL(const base::ListValue* args);
 
   // For showing sync login UI.
   void HandleShowSyncUI(const base::ListValue* args);
 
   // For when the IP address of the printer has been resolved for registration.
   void StartRegisterHTTP(scoped_ptr<PrivetHTTPClient> http_client);
 
   // For when the confirm operation on the cloudprint server has finished
   // executing.
-  void OnConfirmDone(GCDApiFlow::Status status);
+  void OnConfirmDone(GCDApiFlowInterface::Status status);
 
   // Signal to the web interface an error has ocurred while registering.
   void SendRegisterError();
 
   // Singal to the web interface that registration has finished.
   void SendRegisterDone(const std::string& service_name,
                         const DeviceDescription& device);
 
   // Set the visibility of the page.
   void SetIsVisible(bool visible);
 
   // Get the sync account email.
   std::string GetSyncAccount();
 
   // Reset and cancel the current registration.
   void ResetCurrentRegistration();
 
   // Announcement hasn't been sent for a certain time after registration
   // finished. Consider it failed.
   // TODO(noamsml): Re-resolve service first.
   void OnAnnouncementTimeoutReached();
 
   void CheckUserLoggedIn();
 
   void CheckListingDone();
 
-  scoped_ptr<GCDApiFlow> CreateApiFlow(scoped_ptr<GCDApiFlow::Request> request);
+  scoped_ptr<GCDApiFlowInterface> CreateApiFlow();
 
 #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
   void StartCloudPrintConnector();
   void OnCloudPrintPrefsChanged();
   void ShowCloudPrintSetupDialog(const base::ListValue* args);
   void HandleDisableCloudPrintConnector(const base::ListValue* args);
   void SetupCloudPrintConnectorSection();
   void RemoveCloudPrintConnectorSection();
   void RefreshCloudPrintStatusFromService();
 #endif
 
 #if defined(ENABLE_WIFI_BOOTSTRAPPING)
   void StartWifiBootstrapping();
   void OnBootstrappingDeviceChanged(
       bool available,
       const wifi::BootstrappingDeviceDescription& description);
 #endif
 
-  // The current HTTP client (used for the current operation).
-  scoped_ptr<PrivetV1HTTPClient> current_http_client_;
-
-  // The current register operation. Only one allowed at any time.
-  scoped_ptr<PrivetRegisterOperation> current_register_operation_;
-
-  // The current confirm call used during the registration flow.
-  scoped_ptr<GCDApiFlow> confirm_api_call_flow_;
-
-  // The device lister used to list devices on the local network.
-  scoped_ptr<PrivetDeviceLister> privet_lister_;
+  // A map of current device descriptions provided by the PrivetDeviceLister.
+  DeviceDescriptionMap device_descriptions_;
 
   // The service discovery client used listen for devices on the local network.
   scoped_refptr<ServiceDiscoverySharedClient> service_discovery_client_;
 
   // A factory for creating the privet HTTP Client.
   scoped_ptr<PrivetHTTPAsynchronousFactory> privet_http_factory_;
 
   // An object representing the resolution process for the privet_http_factory.
   scoped_ptr<PrivetHTTPResolution> privet_resolution_;
 
-  // A map of current device descriptions provided by the PrivetDeviceLister.
-  DeviceDescriptionMap device_descriptions_;
+  // The current HTTP client (used for the current operation).
+  scoped_ptr<PrivetV1HTTPClient> current_http_client_;
+
+  // The current register operation. Only one allowed at any time.
+  scoped_ptr<PrivetRegisterOperation> current_register_operation_;
+
+  // The current confirm call used during the registration flow.
+  scoped_ptr<GCDApiFlowInterface> confirm_api_call_flow_;
+
+  // The device lister used to list devices on the local network.
+  scoped_ptr<PrivetDeviceLister> privet_lister_;
 
   // Whether or not the page is marked as visible.
   bool is_visible_;
 
   // List of printers from cloud print.
-  scoped_ptr<GCDApiFlow> cloud_print_printer_list_;
-  scoped_ptr<GCDApiFlow> cloud_device_list_;
+  scoped_ptr<GCDApiFlowInterface> cloud_print_printer_list_;
+  scoped_ptr<GCDApiFlowInterface> cloud_device_list_;
   std::vector<Device> cloud_devices_;
   int failed_list_count_;
   int succeded_list_count_;
 
 #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
   StringPrefMember cloud_print_connector_email_;
   BooleanPrefMember cloud_print_connector_enabled_;
   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);
 };
 
 #undef CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
 
 }  // namespace local_discovery
 #endif  // CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_HANDLER_H_