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

Unified Diff: chrome/browser/sync/sync_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 defaults 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/sync/sync_global_error.cc
diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc
index e3297190b6c51b2d7bf030eca569c7f2adebf6e7..8d8fae19e71fd124e889ff4be84bc7cfaed71976 100644
--- a/chrome/browser/sync/sync_global_error.cc
+++ b/chrome/browser/sync/sync_global_error.cc
@@ -19,7 +19,10 @@
#include "google_apis/gaia/google_service_auth_error.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"
SyncGlobalError::SyncGlobalError(ProfileSyncService* service,
SigninManagerBase* signin)
@@ -60,6 +63,11 @@ bool SyncGlobalError::HasBubbleView() {
return !bubble_message_.empty() && !bubble_accept_label_.empty();
}
+gfx::Image SyncGlobalError::GetBubbleViewIcon() {
+ return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_INPUT_ALERT);
+}
+
string16 SyncGlobalError::GetBubbleViewTitle() {
return l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE);
}

Powered by Google App Engine
This is Rietveld 408576698