Switch global error menu icon to vectorized MD asset

chrome/browser/signin/signin_ui_util.cc

 // Copyright (c) 2013 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/signin/signin_ui_util.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_elider.h"
 
+namespace signin_ui_util {
+
 namespace {
+
 // Maximum width of a username - we trim emails that are wider than this so
 // the wrench menu doesn't get ridiculously wide.
 const int kUsernameMaxWidth = 200;
-}  // namespace
 
-namespace signin_ui_util {
-
-GlobalError* GetSignedInServiceError(Profile* profile) {
-  std::vector<GlobalError*> errors = GetSignedInServiceErrors(profile);
-  if (errors.empty())
-    return NULL;
-  return errors[0];
-}
-
+// Returns all errors reported by signed in services.
 std::vector<GlobalError*> GetSignedInServiceErrors(Profile* profile) {
   std::vector<GlobalError*> errors;
   // Chrome OS doesn't use SigninGlobalError or SyncGlobalError. Other platforms
   // may use these services to show auth and sync errors in the toolbar menu.
 #if !defined(OS_CHROMEOS)
   // Auth errors have the highest priority - after that, individual service
   // errors.
   SigninGlobalError* signin_error =
       SigninGlobalErrorFactory::GetForProfile(profile);
   if (signin_error && signin_error->HasError())
     errors.push_back(signin_error);
 
   // No auth error - now try other services. Currently the list is just hard-
   // coded but in the future if we add more we can create some kind of
   // registration framework.
   if (profile->IsSyncAllowed()) {
     SyncGlobalError* error = SyncGlobalErrorFactory::GetForProfile(profile);
     if (error && error->HasMenuItem())
       errors.push_back(error);
   }
 #endif
 
   return errors;
 }
 
+// If a signed in service is reporting an error, returns the GlobalError
+// object associated with that service, or NULL if no errors are reported.
+GlobalError* GetSignedInServiceError(Profile* profile) {
+  std::vector<GlobalError*> errors = GetSignedInServiceErrors(profile);
+  if (errors.empty())
+    return NULL;
+  return errors[0];
+}
+
+}  // namespace
+
 base::string16 GetSigninMenuLabel(Profile* profile) {
   GlobalError* error = signin_ui_util::GetSignedInServiceError(profile);
   if (error)
     return error->MenuItemLabel();
 
   // No errors, so just display the signed in user, if any.
   ProfileSyncService* service = profile->IsSyncAllowed() ?
       ProfileSyncServiceFactory::GetForProfile(profile) : NULL;
 
   // Even if the user is signed in, don't display the "signed in as..."
@@ skipping 98 matching lines @@
   std::string email = account_tracker->GetAccountInfo(account_id).email;
   if (email.empty()) {
     DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,
               account_tracker->GetMigrationState());
     return account_id;
   }
   return email;
 }
 
 }  // namespace signin_ui_util