Cleanup LocalDiscoveryUIHandler.

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>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_printer_list.h"
 #include "chrome/browser/printing/cloud_print/privet_device_lister.h"
 #include "chrome/browser/printing/cloud_print/privet_http.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS)
 #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
 #endif
 
+class CloudPrintProxyService;
+
 namespace cloud_print {
-class PrivetConfirmApiCallFlow;
 class PrivetHTTPAsynchronousFactory;
 class PrivetHTTPResolution;
 class PrivetV1HTTPClient;
 }
 
 // TODO(noamsml): Factor out full registration flow into single class
 namespace local_discovery {
 
 class ServiceDiscoverySharedClient;
 
@@ skipping 42 matching lines @@
   void OnDeviceListUnavailable() override;
 
   // SigninManagerBase::Observer implementation.
   void GoogleSigninSucceeded(const std::string& account_id,
                              const std::string& username,
                              const std::string& password) override;
   void GoogleSignedOut(const std::string& account_id,
                        const std::string& username) override;
 
  private:
-  typedef std::map<std::string,
-                   cloud_print::DeviceDescription> DeviceDescriptionMap;
-  typedef base::Callback<void(bool result)> ResultCallback;
+  using DeviceDescriptionMap =
+      std::map<std::string, cloud_print::DeviceDescription>;
+  using ResultCallback = base::Callback<void(bool result)>;
 
   // Message handlers:
   // For when the page is ready to receive device notifications.
   void HandleStart(const base::ListValue* args);
 
   // For when a visibility change occurs.
   void HandleIsVisible(const base::ListValue* args);
 
   // For when a user choice is made.
   void HandleRegisterDevice(const base::ListValue* args);
@@ skipping 22 matching lines @@
   // 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);
 
   // Set the visibility of the page.
   void SetIsVisible(bool visible);
 
   // Get the sync account email.
-  std::string GetSyncAccount();
+  std::string GetSyncAccount() const;
 
   // Reset and cancel the current registration.
   void ResetCurrentRegistration();
 
   std::unique_ptr<cloud_print::GCDApiFlow> CreateApiFlow();
   void OnSetupError();
 
   // 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();
 
   bool IsUserSupervisedOrOffTheRecord();
 
 #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();
+  CloudPrintProxyService* GetCloudPrintProxyService();
 #endif
 
   // 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.
   std::unique_ptr<cloud_print::PrivetHTTPAsynchronousFactory>
@@ skipping 20 matching lines @@
 
   // List of printers from cloud print.
   std::unique_ptr<cloud_print::GCDApiFlow> cloud_print_printer_list_;
   std::vector<cloud_print::CloudPrintPrinterList::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_;

[Vitaly Buka (NO REVIEWS), 2016/04/16 01:33:52]

you are replacing this with def?

[Lei Zhang, 2016/04/16 01:53:19]

I'm assuming this is always true now.

[Vitaly Buka (NO REVIEWS), 2016/04/16 02:17:56]

sgtm

 #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_