[MD User Menu] New way to handle supervised user auth error

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sync/sync_ui_util.h"
 
 #include <stdint.h>
 
 #include <string>
 
@@ skipping 419 matching lines @@
       *content_string_id = IDS_SYNC_ERROR_USER_MENU_SIGNIN_AGAIN_MESSAGE;
       *button_string_id = IDS_SYNC_ERROR_USER_MENU_SIGNIN_AGAIN_BUTTON;
       return UNRECOVERABLE_ERROR;
     }
   }
 
   // Check for an auth error.
   SigninErrorController* signin_error_controller =
       SigninErrorControllerFactory::GetForProfile(profile);
   if (signin_error_controller && signin_error_controller->HasError()) {
+    if (profile->IsSupervised()) {
+      // For a supervised user, no direct action can be taken to resolve an
+      // auth token error.
+      *content_string_id = IDS_SYNC_ERROR_USER_MENU_SUPERVISED_SIGNIN_MESSAGE;
+      *button_string_id = 0;
+      return SUPERVISED_USER_AUTH_ERROR;
+    }
+    // For a non-supervised user, the user can reauth to resolve the signin
+    // error.
     *content_string_id = IDS_SYNC_ERROR_USER_MENU_SIGNIN_MESSAGE;
     *button_string_id = IDS_SYNC_ERROR_USER_MENU_SIGNIN_BUTTON;
     return AUTH_ERROR;
   }
 
   // Check for sync errors if the sync service is enabled.
   if (service) {
     // Check for an actionable UPGRADE_CLIENT error.
     ProfileSyncService::Status status;
     service->QueryDetailedSyncStatus(&status);
@@ skipping 28 matching lines @@
 base::string16 ConstructTime(int64_t time_in_int) {
   base::Time time = base::Time::FromInternalValue(time_in_int);
 
   // If time is null the format function returns a time in 1969.
   if (time.is_null())
     return base::string16();
   return base::TimeFormatFriendlyDateAndTime(time);
 }
 
 }  // namespace sync_ui_util