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

chrome/browser/chromeos/policy/consumer_management_service.cc

Index: chrome/browser/chromeos/policy/consumer_management_service.cc
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc
index 9c7fbaa92255d21c79c2174ad1bde267f2f514f8..8e9a0dcb232f38888430f02d519dc9a71e0c72d8 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_service.cc
@@ -11,6 +11,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
@@ -19,10 +20,14 @@
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/notifications/notification.h"
+#include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "chromeos/dbus/cryptohome/rpc.pb.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
@@ -32,13 +37,33 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/common/page_transition_types.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "policy/proto/device_management_backend.pb.h"
+#include "third_party/WebKit/public/web/WebTextDirection.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/window_open_disposition.h"
+#include "ui/message_center/notification.h"
+#include "ui/message_center/notification_types.h"
+#include "ui/message_center/notifier_settings.h"
+#include "url/gurl.h"
 
 namespace {
 
-const char* kAttributeOwnerId = "consumer_management.owner_id";
+// Boot atttributes ID.
+const char kAttributeOwnerId[] = "consumer_management.owner_id";
+
+// Desktop notification constants.
+const char kEnrollmentNotificationId[] = "consumer_management.enroll";
+const char kEnrollmentNotificationUrl[] = "chrome://consumer-management/enroll";
+
+// The relative path to the settings page URL for opening the consumer

[bartfab (slow), 2014/08/21 12:04:25]

How about:

The path to the consumer management enrollment/unenrollment confirmation
overlay, relative to the settings page URL.

[davidyu, 2014/08/22 04:23:10]

Done.

+// management enrollment/unenrollment confirmation overlay.
+const char kConsumerManagementOverlay[] = "consumer-management-overlay";
 
 }  // namespace
 
@@ -48,7 +73,7 @@ ConsumerManagementService::ConsumerManagementService(
     chromeos::CryptohomeClient* client)
     : Consumer("consumer_management_service"),
       client_(client),
-      enrolling_token_service_(NULL),
+      enrolling_profile_(NULL),
       weak_ptr_factory_(this) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
@@ -59,8 +84,10 @@ ConsumerManagementService::~ConsumerManagementService() {
   registrar_.Remove(this,
                     chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                     content::NotificationService::AllSources());
-  if (enrolling_token_service_)
-    enrolling_token_service_->RemoveObserver(this);
+  if (enrolling_profile_) {
+    ProfileOAuth2TokenServiceFactory::GetForProfile(enrolling_profile_)->
+        RemoveObserver(this);
+  }
 }
 
 // static
@@ -96,21 +123,6 @@ void ConsumerManagementService::GetOwner(const GetOwnerCallback& callback) {
                  callback));
 }
 
-void ConsumerManagementService::OnGetBootAttributeDone(
-    const GetOwnerCallback& callback,
-    chromeos::DBusMethodCallStatus call_status,
-    bool dbus_success,
-    const cryptohome::BaseReply& reply) {
-  if (!dbus_success || reply.error() != 0) {
-    LOG(ERROR) << "Failed to get the owner info from boot lockbox.";
-    callback.Run("");
-    return;
-  }
-
-  callback.Run(
-      reply.GetExtension(cryptohome::GetBootAttributeReply::reply).value());
-}
-
 void ConsumerManagementService::SetOwner(const std::string& user_id,
                                          const SetOwnerCallback& callback) {
   cryptohome::SetBootAttributeRequest request;
@@ -123,39 +135,6 @@ void ConsumerManagementService::SetOwner(const std::string& user_id,
                  callback));
 }
 
-void ConsumerManagementService::OnSetBootAttributeDone(
-    const SetOwnerCallback& callback,
-    chromeos::DBusMethodCallStatus call_status,
-    bool dbus_success,
-    const cryptohome::BaseReply& reply) {
-  if (!dbus_success || reply.error() != 0) {
-    LOG(ERROR) << "Failed to set owner info in boot lockbox.";
-    callback.Run(false);
-    return;
-  }
-
-  cryptohome::FlushAndSignBootAttributesRequest request;
-  client_->FlushAndSignBootAttributes(
-      request,
-      base::Bind(&ConsumerManagementService::OnFlushAndSignBootAttributesDone,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback));
-}
-
-void ConsumerManagementService::OnFlushAndSignBootAttributesDone(
-    const SetOwnerCallback& callback,
-    chromeos::DBusMethodCallStatus call_status,
-    bool dbus_success,
-    const cryptohome::BaseReply& reply) {
-  if (!dbus_success || reply.error() != 0) {
-    LOG(ERROR) << "Failed to flush and sign boot lockbox.";
-    callback.Run(false);
-    return;
-  }
-
-  callback.Run(true);
-}
-
 void ConsumerManagementService::Observe(
     int type,
     const content::NotificationSource& source,
@@ -172,8 +151,11 @@ void ConsumerManagementService::Observe(
 
 void ConsumerManagementService::OnRefreshTokenAvailable(
     const std::string& account_id) {
-  if (account_id == enrolling_account_id_) {
-    enrolling_token_service_->RemoveObserver(this);
+  CHECK(enrolling_profile_);
+
+  if (account_id == GetAccountIdFromProfile(enrolling_profile_)) {
+    ProfileOAuth2TokenServiceFactory::GetForProfile(enrolling_profile_)->
+        RemoveObserver(this);
     OnOwnerRefreshTokenAvailable();
   }
 }
@@ -198,6 +180,93 @@ void ConsumerManagementService::OnGetTokenFailure(
   EndEnrollment(ENROLLMENT_GET_TOKEN_FAILED);
 }
 
+ConsumerManagementService::DesktopNotificationDelegate::
+    DesktopNotificationDelegate(
+        const std::string& id,
+        const base::Closure& button_click_callback)
+        : id_(id),
+          button_click_callback_(button_click_callback) {
+}
+
+ConsumerManagementService::DesktopNotificationDelegate::
+    ~DesktopNotificationDelegate() {
+}
+
+std::string ConsumerManagementService::DesktopNotificationDelegate::id() const {
+  return id_;
+}
+
+content::WebContents* ConsumerManagementService::DesktopNotificationDelegate::
+    GetWebContents() const {
+  return NULL;
+}
+
+void ConsumerManagementService::DesktopNotificationDelegate::Display() {
+}
+
+void ConsumerManagementService::DesktopNotificationDelegate::ButtonClick(
+    int button_index) {
+  button_click_callback_.Run();
+}
+
+void ConsumerManagementService::DesktopNotificationDelegate::Error() {
+}
+
+void ConsumerManagementService::DesktopNotificationDelegate::Close(
+    bool by_user) {
+}
+
+void ConsumerManagementService::DesktopNotificationDelegate::Click() {
+}
+
+void ConsumerManagementService::OnGetBootAttributeDone(
+    const GetOwnerCallback& callback,
+    chromeos::DBusMethodCallStatus call_status,
+    bool dbus_success,
+    const cryptohome::BaseReply& reply) {
+  if (!dbus_success || reply.error() != 0) {
+    LOG(ERROR) << "Failed to get the owner info from boot lockbox.";
+    callback.Run("");
+    return;
+  }
+
+  callback.Run(
+      reply.GetExtension(cryptohome::GetBootAttributeReply::reply).value());
+}
+
+void ConsumerManagementService::OnSetBootAttributeDone(
+    const SetOwnerCallback& callback,
+    chromeos::DBusMethodCallStatus call_status,
+    bool dbus_success,
+    const cryptohome::BaseReply& reply) {
+  if (!dbus_success || reply.error() != 0) {
+    LOG(ERROR) << "Failed to set owner info in boot lockbox.";
+    callback.Run(false);
+    return;
+  }
+
+  cryptohome::FlushAndSignBootAttributesRequest request;
+  client_->FlushAndSignBootAttributes(
+      request,
+      base::Bind(&ConsumerManagementService::OnFlushAndSignBootAttributesDone,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 callback));
+}
+
+void ConsumerManagementService::OnFlushAndSignBootAttributesDone(
+    const SetOwnerCallback& callback,
+    chromeos::DBusMethodCallStatus call_status,
+    bool dbus_success,
+    const cryptohome::BaseReply& reply) {
+  if (!dbus_success || reply.error() != 0) {
+    LOG(ERROR) << "Failed to flush and sign boot lockbox.";
+    callback.Run(false);
+    return;
+  }
+
+  callback.Run(true);
+}
+
 void ConsumerManagementService::OnOwnerSignin(Profile* profile) {
   const ConsumerEnrollmentState state = GetEnrollmentState();
   switch (state) {
@@ -215,7 +284,7 @@ void ConsumerManagementService::OnOwnerSignin(Profile* profile) {
     case ENROLLMENT_BOOT_LOCKBOX_FAILED:
     case ENROLLMENT_DM_SERVER_FAILED:
     case ENROLLMENT_GET_TOKEN_FAILED:
-      ShowDesktopNotificationAndResetState(state);
+      ShowDesktopNotificationAndResetState(state, profile);
       return;
 
     case ENROLLMENT_REQUESTED:
@@ -226,31 +295,29 @@ void ConsumerManagementService::OnOwnerSignin(Profile* profile) {
 }
 
 void ConsumerManagementService::ContinueEnrollmentProcess(Profile* profile) {
-  // First, we need to ensure that the refresh token is available.
-  SigninManagerBase* signin_manager =
-      SigninManagerFactory::GetForProfile(profile);
-  enrolling_account_id_ = signin_manager->GetAuthenticatedAccountId();
+  enrolling_profile_ = profile;
 
-  enrolling_token_service_ =
+  // First, we need to ensure that the refresh token is available.
+  const std::string account_id = GetAccountIdFromProfile(profile);

[bartfab (slow), 2014/08/21 12:04:25]

Nit: s/std::string/std::string&/

[davidyu, 2014/08/22 04:23:10]

Done.

+  ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
-  if (enrolling_token_service_->RefreshTokenIsAvailable(
-          enrolling_account_id_)) {
+  if (token_service->RefreshTokenIsAvailable(account_id)) {
     OnOwnerRefreshTokenAvailable();
   } else {
-    enrolling_token_service_->AddObserver(this);
+    token_service->AddObserver(this);
   }
 }
 
 void ConsumerManagementService::OnOwnerRefreshTokenAvailable() {
-  CHECK(enrolling_token_service_);
+  CHECK(enrolling_profile_);
 
   // Now we can request the OAuth access token for device management to send the
   // device registration request to the device management server.
   OAuth2TokenService::ScopeSet oauth_scopes;
   oauth_scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
-
-  token_request_ = enrolling_token_service_->StartRequest(
-      enrolling_account_id_, oauth_scopes, this);
+  const std::string account_id = GetAccountIdFromProfile(enrolling_profile_);

[bartfab (slow), 2014/08/21 12:04:25]

Nit: s/std::string/std::string&/

[davidyu, 2014/08/22 04:23:10]

Done.

+  token_request_ = ProfileOAuth2TokenServiceFactory::GetForProfile(
+      enrolling_profile_)->StartRequest(account_id, oauth_scopes, this);
 }
 
 void ConsumerManagementService::OnOwnerAccessTokenAvailable(
@@ -292,16 +359,88 @@ void ConsumerManagementService::OnEnrollmentCompleted(EnrollmentStatus status) {
 }
 
 void ConsumerManagementService::EndEnrollment(ConsumerEnrollmentState state) {
+  Profile* profile = enrolling_profile_;
+  enrolling_profile_ = NULL;
+
   SetEnrollmentState(state);
   if (user_manager::UserManager::Get()->IsCurrentUserOwner())
-    ShowDesktopNotificationAndResetState(state);
+    ShowDesktopNotificationAndResetState(state, profile);
 }
 
 void ConsumerManagementService::ShowDesktopNotificationAndResetState(
-    ConsumerEnrollmentState state) {
-  // TODO(davidyu): Show a desktop notification to the current user, who should
-  // be the owner.
+    ConsumerEnrollmentState state, Profile* profile) {
+  base::string16 title;
+  base::string16 body;
+  base::string16 button_label;
+  base::Closure button_click_callback;
+
+  if (state == ENROLLMENT_SUCCESS) {
+    title = l10n_util::GetStringUTF16(
+        IDS_CONSUMER_MANAGEMENT_ENROLLMENT_NOTIFICATION_TITLE);
+    body = l10n_util::GetStringUTF16(
+        IDS_CONSUMER_MANAGEMENT_ENROLLMENT_NOTIFICATION_BODY);
+    button_label = l10n_util::GetStringUTF16(
+        IDS_CONSUMER_MANAGEMENT_NOTIFICATION_MODIFY_SETTINGS_BUTTON);
+    button_click_callback = base::Bind(
+        &ConsumerManagementService::OpenSettingsPage,
+        weak_ptr_factory_.GetWeakPtr(),
+        profile);
+  } else {
+    title = l10n_util::GetStringUTF16(
+        IDS_CONSUMER_MANAGEMENT_ENROLLMENT_FAILURE_NOTIFICATION_TITLE);
+    body = l10n_util::GetStringUTF16(
+        IDS_CONSUMER_MANAGEMENT_ENROLLMENT_FAILURE_NOTIFICATION_BODY);
+    button_label = l10n_util::GetStringUTF16(
+        IDS_CONSUMER_MANAGEMENT_NOTIFICATION_TRY_AGAIN_BUTTON);
+    button_click_callback = base::Bind(
+        &ConsumerManagementService::TryEnrollmentAgain,
+        weak_ptr_factory_.GetWeakPtr(),
+        profile);
+  }
+
+  message_center::RichNotificationData optional_field;
+  optional_field.buttons.push_back(message_center::ButtonInfo(button_label));
+  Notification notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE,
+      GURL(kEnrollmentNotificationUrl),
+      title,
+      body,
+      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+          IDR_CONSUMER_MANAGEMENT_NOTIFICATION_ICON),
+      blink::WebTextDirectionDefault,
+      message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
+                                 kEnrollmentNotificationId),
+      base::string16(),  // display_source
+      base::UTF8ToUTF16(kEnrollmentNotificationId),
+      optional_field,
+      new DesktopNotificationDelegate(kEnrollmentNotificationId,
+                                      button_click_callback));
+  notification.SetSystemPriority();
+  g_browser_process->notification_ui_manager()->Add(notification, profile);
+
   SetEnrollmentState(ENROLLMENT_NONE);
 }
 
+void ConsumerManagementService::OpenSettingsPage(Profile* profile) const {
+  const GURL url(chrome::kChromeUISettingsURL);
+  chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK);
+  params.disposition = NEW_FOREGROUND_TAB;
+  chrome::Navigate(&params);
+}
+
+void ConsumerManagementService::TryEnrollmentAgain(Profile* profile) const {
+  GURL base_url(chrome::kChromeUISettingsURL);
+  GURL url = base_url.Resolve(kConsumerManagementOverlay);

[bartfab (slow), 2014/08/21 12:04:25]

Nit: const.

[davidyu, 2014/08/22 04:23:10]

Done.

+
+  chrome::NavigateParams params(profile, url, content::PAGE_TRANSITION_LINK);
+  params.disposition = NEW_FOREGROUND_TAB;
+  chrome::Navigate(&params);
+}
+
+const std::string& ConsumerManagementService::GetAccountIdFromProfile(
+    Profile* profile) const {
+  return SigninManagerFactory::GetForProfile(profile)->
+      GetAuthenticatedAccountId();
+}
+
 }  // namespace policy