arc: Show migration success notification on the next sign-in after migration.

chrome/browser/chromeos/arc/arc_migration_guide_notification.cc

Index: chrome/browser/chromeos/arc/arc_migration_guide_notification.cc
diff --git a/chrome/browser/chromeos/arc/arc_migration_guide_notification.cc b/chrome/browser/chromeos/arc/arc_migration_guide_notification.cc
index d1d283a2ba2a2dc8476c42183574c4e78abf4792..c21033cfb4b365b9ddc094d093de7e8784321978 100644
--- a/chrome/browser/chromeos/arc/arc_migration_guide_notification.cc
+++ b/chrome/browser/chromeos/arc/arc_migration_guide_notification.cc
@@ -6,16 +6,20 @@
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/grit/theme_resources.h"
 #include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/known_user.h"

[kinaba, 2017/04/20 07:55:10]

Another implementation option is to factor out the logic for
checking/setting the preference to arc_util, to something like

bool CheckAndUpdateIfMigrationSuccessNotificationNeeded(Profile*);

and turn the method below as
if(CheckAndUpdateIfMigrationSuccessNotificationNeeded()) show();

That's more modular and testable but I'm not so sure if adding
such a method very specific to this feature in arc_util.h is ok.

I'd like to ask the owner's opinion. hidehiko@, WDYT?

 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/message_center.h"
+#include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 
@@ -24,7 +28,8 @@ namespace arc {
 namespace {
 
 constexpr char kNotifierId[] = "arc_fs_migration";
-constexpr char kNotificationId[] = "arc_fs_migration/migrate";
+constexpr char kSuggestNotificationId[] = "arc_fs_migration/suggest";
+constexpr char kSuccessNotificationId[] = "arc_fs_migration/success";
 
 class ArcMigrationGuideNotificationDelegate
     : public message_center::NotificationDelegate {
@@ -46,8 +51,8 @@ class ArcMigrationGuideNotificationDelegate
 void ShowArcMigrationGuideNotification(Profile* profile) {
   // Always remove the notification to make sure the notification appears
   // as a popup in any situation.
-  message_center::MessageCenter::Get()->RemoveNotification(kNotificationId,
-                                                           false /* by_user */);
+  message_center::MessageCenter::Get()->RemoveNotification(
+      kSuggestNotificationId, false /* by_user */);
 
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT, kNotifierId);
@@ -57,19 +62,58 @@ void ShowArcMigrationGuideNotification(Profile* profile) {
   message_center::RichNotificationData data;
   data.buttons.push_back(message_center::ButtonInfo(l10n_util::GetStringUTF16(
       IDS_ARC_MIGRATE_ENCRYPTION_NOTIFICATION_RESTART_BUTTON)));
-  ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
   message_center::MessageCenter::Get()->AddNotification(
       base::MakeUnique<message_center::Notification>(
-          message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId,
+          message_center::NOTIFICATION_TYPE_SIMPLE, kSuggestNotificationId,
           l10n_util::GetStringUTF16(
               IDS_ARC_MIGRATE_ENCRYPTION_NOTIFICATION_TITLE),
           // TODO(kinaba): crbug/710289 Change message for low-battery case.
           l10n_util::GetStringUTF16(
               IDS_ARC_MIGRATE_ENCRYPTION_NOTIFICATION_MESSAGE),
-          // TODO(kinaba): crbug/710285 Replace the icon with the final design.
-          resource_bundle.GetImageNamed(IDR_ARC_PLAY_STORE_NOTIFICATION),
+          gfx::Image(gfx::CreateVectorIcon(
+              kArcMigrateEncryptionNotificationIcon,
+              message_center::kNotificationIconSize, gfx::kPlaceholderColor)),
           base::string16(), GURL(), notifier_id, data,
           new ArcMigrationGuideNotificationDelegate()));
 }
 
+void ShowArcMigrationSuccessNotificationIfNeeded(Profile* profile) {
+  const AccountId account_id(multi_user_util::GetAccountIdFromProfile(profile));
+
+  int pref_value = kFileSystemIncompatible;
+  user_manager::known_user::GetIntegerPref(
+      account_id, prefs::kArcCompatibleFilesystemChosen, &pref_value);
+
+  // Show notification only when the pref value indicates the file system is
+  // compatible, but not yet notified.
+  if (pref_value != kFileSystemCompatible)
+    return;
+
+  // If this is a newly created profile, the filesystem was compatible from
+  // the beginning, not because of migration. Skip showing the notification.
+  if (!profile->IsNewProfile()) {
+    message_center::NotifierId notifier_id(
+        message_center::NotifierId::SYSTEM_COMPONENT, kNotifierId);
+    notifier_id.profile_id = account_id.GetUserEmail();
+
+    message_center::MessageCenter::Get()->AddNotification(
+        base::MakeUnique<message_center::Notification>(
+            message_center::NOTIFICATION_TYPE_SIMPLE, kSuccessNotificationId,
+            base::string16(),  // title
+            l10n_util::GetStringUTF16(
+                IDS_ARC_MIGRATE_ENCRYPTION_SUCCESS_MESSAGE),
+            gfx::Image(gfx::CreateVectorIcon(
+                kArcMigrateEncryptionNotificationIcon,
+                message_center::kNotificationIconSize, gfx::kPlaceholderColor)),
+            base::string16(), GURL(), notifier_id,
+            message_center::RichNotificationData(),
+            new message_center::NotificationDelegate()));
+  }
+
+  // Mark as notified.
+  user_manager::known_user::SetIntegerPref(
+      account_id, prefs::kArcCompatibleFilesystemChosen,
+      arc::kFileSystemCompatibleAndNotified);
+}
+
 }  // namespace arc