Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3884)

Unified Diff: chrome/browser/ui/global_error/global_error_service.cc

Issue 11150002: New post-sideload UI: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: !!! Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/global_error/global_error_service.cc
diff --git a/chrome/browser/ui/global_error/global_error_service.cc b/chrome/browser/ui/global_error/global_error_service.cc
index 205ac05aab04343e4141eba7b6e3c0ca8b03f416..b2a1839280321feae8856639873fac898303d7d6 100644
--- a/chrome/browser/ui/global_error/global_error_service.cc
+++ b/chrome/browser/ui/global_error/global_error_service.cc
@@ -45,13 +45,21 @@ GlobalError* GlobalErrorService::GetGlobalErrorByMenuItemCommandID(
}
int GlobalErrorService::GetFirstBadgeResourceID() const {
+ GlobalError::Severity highest_severity = GlobalError::SEVERITY_LOW;
+ int resource_id = 0;
+
for (GlobalErrorList::const_iterator
it = errors_.begin(); it != errors_.end(); ++it) {
GlobalError* error = *it;
- if (error->HasBadge())
- return error->GetBadgeResourceID();
+ if (error->HasBadge()) {
+ if (resource_id == 0 || error->GetSeverity() > highest_severity) {
+ highest_severity = error->GetSeverity();
+ resource_id = error->GetBadgeResourceID();
+ }
+ }
}
- return 0;
+
+ return resource_id;
}
GlobalError* GlobalErrorService::GetFirstGlobalErrorWithBubbleView() const {
« no previous file with comments | « chrome/browser/ui/global_error/global_error.cc ('k') | chrome/browser/ui/global_error/global_error_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698