Show a desktop notification when the enrollment is completed or failed.

chrome/browser/chromeos/policy/consumer_management_service.h

 // Copyright 2014 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_POLICY_CONSUMER_MANAGEMENT_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_MANAGEMENT_SERVICE_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/strings/string16.h"
+#include "chrome/browser/notifications/notification_delegate.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
+class NotificationUIManager;

[bartfab (slow), 2014/08/20 13:55:52]

Nit: Not used.

[davidyu, 2014/08/21 04:08:25]

Done.

 class PrefRegistrySimple;
 class Profile;
 class ProfileOAuth2TokenService;
 
 namespace chromeos {
 class CryptohomeClient;
 }
 
+namespace content {
+class WebContents;

[bartfab (slow), 2014/08/20 13:55:51]

Nit: This is unnecessary, because WebContents is used in an overridden
declaration only.

[davidyu, 2014/08/21 04:08:25]

Done.

[davidyu, 2014/08/21 04:08:26]

Done.

+}
+
 namespace cryptohome {
 class BaseReply;
 }
 
 namespace policy {
 
 class EnrollmentStatus;
 
 // The consumer management service handles several things:
 //
@@ skipping 72 matching lines @@
       const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(
       const OAuth2TokenService::Request* request,
       const GoogleServiceAuthError& error) OVERRIDE;
 
   OAuth2TokenService::Request* GetTokenRequestForTesting() {
     return token_request_.get();
   }
 
  private:
+  class DesktopNotificationDelegate : public NotificationDelegate {
+   public:
+    // |display_callback| is called when the notification is displayed.

[bartfab (slow), 2014/08/20 13:55:52]

There is no |display_callback|?

[davidyu, 2014/08/21 04:08:25]

Done.

+    // |button_click_callback| is called when the button of notification

[bartfab (slow), 2014/08/20 13:55:51]

Nit: s/of/in the/

[davidyu, 2014/08/21 04:08:25]

Done.

+    // clicked.

[bartfab (slow), 2014/08/20 13:55:51]

Nit: s/clicked/is clicked/

[davidyu, 2014/08/21 04:08:25]

Done.

+    DesktopNotificationDelegate(
+        const std::string& id,
+        const base::Closure& button_click_callback);

[oshima, 2014/08/20 13:24:01]

virtual dtor

[davidyu, 2014/08/21 04:08:25]

Done.

+
+    // NotificationDelegate implementation.

[oshima, 2014/08/20 13:24:01]

// NotificationDelegate: 

is new style.

[davidyu, 2014/08/21 04:08:25]

Done.

+    virtual std::string id() const OVERRIDE {

[bartfab (slow), 2014/08/20 13:55:51]

Nit: The style guide forbids inlining virtual functions.

[davidyu, 2014/08/21 04:08:25]

Done.

+      return id_;
+    };
+    virtual content::WebContents* GetWebContents() const OVERRIDE {

[bartfab (slow), 2014/08/20 13:55:52]

Nit: The style guide forbids inlining virtual functions.

[davidyu, 2014/08/21 04:08:25]

Done.

+      return NULL;
+    }
+
+    // message_center::NotificationDelegate implementation.

[oshima, 2014/08/20 13:24:01]

is this dup?

[bartfab (slow), 2014/08/20 13:55:51]

Nit: That's the same NotificationDelegate as referenced by the comment in line
136. No need for two comments referencing the same base class.

[davidyu, 2014/08/21 04:08:25]

Done.

+    virtual void Display() OVERRIDE {}

[bartfab (slow), 2014/08/20 13:55:51]

Nit: The style guide forbids inlining virtual functions.

[davidyu, 2014/08/21 04:08:26]

Done.

+    virtual void ButtonClick(int button_index) OVERRIDE;
+    virtual void Error() OVERRIDE {}

[bartfab (slow), 2014/08/20 13:55:51]

Nit: The style guide forbids inlining virtual functions.

[davidyu, 2014/08/21 04:08:26]

Done.

+    virtual void Close(bool by_user) OVERRIDE {}

[bartfab (slow), 2014/08/20 13:55:52]

Nit: The style guide forbids inlining virtual functions.

[davidyu, 2014/08/21 04:08:25]

Done.

+    virtual void Click() OVERRIDE {}

[bartfab (slow), 2014/08/20 13:55:51]

Nit: The style guide forbids inlining virtual functions.

[davidyu, 2014/08/21 04:08:25]

Done.

+
+   private:
+    std::string id_;
+    base::Closure button_click_callback_;
+
+    DISALLOW_COPY_AND_ASSIGN(DesktopNotificationDelegate);
+  };
+
   void OnGetBootAttributeDone(
       const GetOwnerCallback& callback,
       chromeos::DBusMethodCallStatus call_status,
       bool dbus_success,
       const cryptohome::BaseReply& reply);
 
   void OnSetBootAttributeDone(const SetOwnerCallback& callback,
                               chromeos::DBusMethodCallStatus call_status,
                               bool dbus_success,
                               const cryptohome::BaseReply& reply);
@@ skipping 18 matching lines @@
   void OnOwnerAccessTokenAvailable(const std::string& access_token);
 
   // Called upon the completion of the enrollment process.
   void OnEnrollmentCompleted(EnrollmentStatus status);
 
   // Ends the enrollment process and shows a desktop notification if the
   // current user is the owner.
   void EndEnrollment(ConsumerEnrollmentState state);
 
   // Shows a desktop notification and resets the enrollment state.
-  void ShowDesktopNotificationAndResetState(ConsumerEnrollmentState state);
+  void ShowDesktopNotificationAndResetState(ConsumerEnrollmentState state,
+                                            Profile* profile);
+
+  // Opens the settings page.
+  void OpenSettingsPage(Profile* profile) const;
+
+  // Opens the enrollment confirmation dialog in the settings page.
+  void TryEnrollmentAgain(Profile* profile) const;
+
+  // Shows a desktop notification with a button.
+  void ShowDesktopNotification(
+      Profile* profile,
+      const std::string& id,
+      const std::string& origin_url,
+      const base::string16& title,
+      const base::string16& body,
+      const base::string16& button_label,
+      const base::Closure& button_click_callback) const;
 
   chromeos::CryptohomeClient* client_;
 
   std::string enrolling_account_id_;

[bartfab (slow), 2014/08/20 13:55:51]

Now that there is an |enrolling_profile_|, we can remove the
|enrolling_account_id_| because you can always get the account ID from the
Profile.

[davidyu, 2014/08/21 04:08:25]

Done.

+  Profile* enrolling_profile_;

[bartfab (slow), 2014/08/20 13:55:52]

Now that there is an |enrolling_profile_|, we can remove the
|enrolling_token_service_| because you can always get the TokenService from the
Profile.

[davidyu, 2014/08/21 04:08:25]

Done.

   ProfileOAuth2TokenService* enrolling_token_service_;
   bool is_observing_token_service_;
 
   scoped_ptr<OAuth2TokenService::Request> token_request_;
   content::NotificationRegistrar registrar_;
   base::WeakPtrFactory<ConsumerManagementService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConsumerManagementService);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_MANAGEMENT_SERVICE_H_