Turn ArcSupportHost from Observer model to Delegate

chrome/browser/chromeos/arc/arc_support_host.h

 // Copyright 2016 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_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 26 matching lines @@
     NETWORK_UNAVAILABLE_ERROR,
     SERVER_COMMUNICATION_ERROR,
     SIGN_IN_BAD_AUTHENTICATION_ERROR,
     SIGN_IN_CLOUD_PROVISION_FLOW_FAIL_ERROR,
     SIGN_IN_GMS_NOT_AVAILABLE_ERROR,
     SIGN_IN_NETWORK_ERROR,
     SIGN_IN_SERVICE_UNAVAILABLE_ERROR,
     SIGN_IN_UNKNOWN_ERROR,
   };
 
-  // Observer to notify UI event.
-  class Observer {
+  // Delegate to handle manual authentication related events.
+  class AuthDelegate {
    public:
-    virtual ~Observer() = default;
+    // Called when LSO auth token fetch is successfully completed.
+    virtual void OnAuthSucceeded(const std::string& auth_code) = 0;
 
-    // Called when the ARC support window is closed.
-    virtual void OnWindowClosed() {}
+    // Called when LSO auth token fetch has failed.
+    virtual void OnAuthFailed() = 0;
 
-    // Called when the user press AGREE button on ToS page.
+    // Called when "RETRY" button on the error page is clicked during
+    // authentication.
+    virtual void OnAuthRetryClicked() = 0;
+
+   protected:
+    virtual ~AuthDelegate() = default;
+  };
+
+  // Delegate to handle manual authentication related events.
+  class TermsOfServiceDelegate {
+   public:
+    // Called when the user press AGREE button on terms of service page.
     virtual void OnTermsAgreed(bool is_metrics_enabled,
                                bool is_backup_and_restore_enabled,
-                               bool is_location_service_enabled) {}
+                               bool is_location_service_enabled) = 0;
 
-    // Called when LSO auth token fetch is successfully completed.
-    virtual void OnAuthSucceeded(const std::string& auth_code) {}
+    // Called when the user rejects the terms of service or close the page.

[khmel, 2017/06/02 17:02:40]

nit: closes

[victorhsieh0, 2017/06/06 18:27:09]

Done.

+    virtual void OnTermsRejected() = 0;
 
-    // Called when LSO auth token fetch has failed.
-    virtual void OnAuthFailed() {}
+    // Called when "RETRY" button on the error page is clicked during terms of
+    // service negotiation.
+    virtual void OnTermsRetryClicked() = 0;
 
-    // Called when "RETRY" button on the error page is clicked.
-    virtual void OnRetryClicked() {}
+   protected:
+    virtual ~TermsOfServiceDelegate() = default;
+  };
+
+  // Delegate to handle general error events.  Note that some of the callback

[khmel, 2017/06/02 17:02:41]

nit: extra space

[victorhsieh0, 2017/06/06 18:27:09]

Done.

+  // will only be called when more the specific callback in the other delegate
+  // is not appropriate.
+  class ErrorDelegate {
+   public:
+    // Called when the window is closed but only when terms of service
+    // negotiation is not ongoing, in which case OnTermsRejected will be called.
+    virtual void OnWindowClosed() = 0;
+
+    // Called when "RETRY" button on the error page is clicked, except when
+    // terms of service negotiation or manual authentication is onging. In those
+    // cases, the more specific retry function in the other delegates is called.
+    virtual void OnRetryClicked() = 0;
 
     // Called when send feedback button on error page is clicked.
-    virtual void OnSendFeedbackClicked() {}
+    virtual void OnSendFeedbackClicked() = 0;
+
+   protected:
+    virtual ~ErrorDelegate() = default;
   };
 
   static const char kStorageId[];
 
   using RequestOpenAppCallback = base::Callback<void(Profile* profile)>;
 
   explicit ArcSupportHost(Profile* profile);
   ~ArcSupportHost() override;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
   bool HasObserver(Observer* observer);
 
+  void SetAuthDelegate(AuthDelegate* delegate);
+  void SetTermsOfServiceDelegate(TermsOfServiceDelegate* delegate);
+  void SetErrorDelegate(ErrorDelegate* delegate);
+
+  bool HasAuthDelegate() const { return auth_delegate_ != nullptr; }
+
   // Called when the communication to arc_support Chrome App is ready.
   void SetMessageHost(arc::ArcSupportMessageHost* message_host);
 
   // Called when the communication to arc_support Chrome App is closed.
   // The argument message_host is used to check if the given |message_host|
   // is what this instance uses know, to avoid racy case.
   // If |message_host| is different from the one this instance knows,
   // this is no op.
   void UnsetMessageHost(arc::ArcSupportMessageHost* message_host);
 
@@ skipping 64 matching lines @@
   // }
   void SendPreferenceCheckboxUpdate(const std::string& action_name,
                                     const PreferenceCheckboxData& data);
 
   void DisconnectMessageHost();
 
   Profile* const profile_;
   RequestOpenAppCallback request_open_app_callback_;
 
   base::ObserverList<Observer> observer_list_;
+  AuthDelegate* auth_delegate_ = nullptr;           // not owned
+  TermsOfServiceDelegate* tos_delegate_ = nullptr;  // not owned
+  ErrorDelegate* error_delegate_ = nullptr;         // not owned
 
   // True, if ARC support app is requested to start, but the connection is not
   // yet established. Reset to false, when the app is started and the
   // connection to the app is established.
   bool app_start_pending_ = false;
 
   // The instance is created and managed by Chrome.
   arc::ArcSupportMessageHost* message_host_ = nullptr;
 
   // The lifetime of the message_host_ is out of control from ARC.
   // Fields below are UI parameter cache in case the value is set before
   // connection to the ARC support Chrome app is established.
   UIPage ui_page_ = UIPage::NO_PAGE;
 
   // These have valid values iff ui_page_ == ERROR.
   Error error_;
   bool should_show_send_feedback_;
 
   bool is_arc_managed_ = false;
 
   PreferenceCheckboxData metrics_checkbox_;
   PreferenceCheckboxData backup_and_restore_checkbox_;
   PreferenceCheckboxData location_services_checkbox_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcSupportHost);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_SUPPORT_HOST_H_