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

Unified Diff: chrome/browser/signin/signin_global_error.cc

Issue 15745022: Add custom icon support to GlobalError. Show extension icon in permissions increase bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no icon ok Created 7 years, 7 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/signin/signin_global_error.cc
diff --git a/chrome/browser/signin/signin_global_error.cc b/chrome/browser/signin/signin_global_error.cc
index 4418ebabf0882d67ddebefda6a4a15d087a32843..9b4786af2b77d1dddac6c5851042a226291c9e44 100644
--- a/chrome/browser/signin/signin_global_error.cc
+++ b/chrome/browser/signin/signin_global_error.cc
@@ -16,7 +16,10 @@
#include "chrome/common/url_constants.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
SigninGlobalError::SigninGlobalError(SigninManagerBase* manager,
Profile* profile)
@@ -122,6 +125,11 @@ bool SigninGlobalError::HasBubbleView() {
return !GetBubbleViewMessages().empty();
}
+gfx::Image SigninGlobalError::GetBubbleViewIcon() {
+ return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_INPUT_ALERT);
+}
+
string16 SigninGlobalError::GetBubbleViewTitle() {
return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE);
}

Powered by Google App Engine
This is Rietveld 408576698