2 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
index 80c0470..ee1d69e 100644
--- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
+++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
@@ -149,6 +149,12 @@ void SupervisedUserImportHandler::OnProfileWasRemoved(
   }
 }
 
+void SupervisedUserImportHandler::OnProfileIsOmittedChanged(
+    const base::FilePath& profile_path) {
+  if (ProfileIsLegacySupervised(profile_path))
+    FetchSupervisedUsers();
+}
+
 void SupervisedUserImportHandler::OnSupervisedUsersChanged() {
   FetchSupervisedUsers();
 }
@@ -187,8 +193,12 @@ void SupervisedUserImportHandler::SendExistingSupervisedUsers(
   // Collect the ids of local supervised user profiles.
   std::set<std::string> supervised_user_ids;
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
-    if (cache.ProfileIsLegacySupervisedAtIndex(i))
+    // Filter out omitted profiles. These are currently being imported, and
+    // shouldn't show up as "already on this device" just yet.
+    if (cache.ProfileIsLegacySupervisedAtIndex(i) &&
+        !cache.IsOmittedProfileAtIndex(i)) {
       supervised_user_ids.insert(cache.GetSupervisedUserIdOfProfileAtIndex(i));
+    }
   }
 
   base::ListValue supervised_users;
diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.h b/chrome/browser/ui/webui/options/supervised_user_import_handler.h
index 0aa9fca..46e93a2 100644
--- a/chrome/browser/ui/webui/options/supervised_user_import_handler.h
+++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.h
@@ -51,6 +51,7 @@ class SupervisedUserImportHandler : public OptionsPageUIHandler,
   void OnProfileWillBeRemoved(const base::FilePath& profile_path) override;
   void OnProfileWasRemoved(const base::FilePath& profile_path,
                            const base::string16& profile_name) override;
+  void OnProfileIsOmittedChanged(const base::FilePath& profile_path) override;
 
   // SupervisedUserSyncServiceObserver implementation.
   void OnSupervisedUserAcknowledged(