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

Unified Diff: chrome/browser/extensions/extension_error_ui_default.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/extensions/extension_error_ui_default.cc
diff --git a/chrome/browser/extensions/extension_error_ui_default.cc b/chrome/browser/extensions/extension_error_ui_default.cc
index a5b706733d10280e75cacb89a486cfcbf9acf8f9..acbdb3c52665ceaecf6546f952ae80d905513d7c 100644
--- a/chrome/browser/extensions/extension_error_ui_default.cc
+++ b/chrome/browser/extensions/extension_error_ui_default.cc
@@ -10,6 +10,9 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
ExtensionErrorUIDefault::ExtensionErrorUIDefault(
ExtensionService* extension_service)
@@ -74,6 +77,11 @@ bool ExtensionErrorUIDefault::ExtensionGlobalError::HasBubbleView() {
return true;
}
+gfx::Image ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewIcon() {
+ return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_INPUT_ALERT);
+}
+
string16 ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewTitle() {
return error_ui_->GetBubbleViewTitle();
}

Powered by Google App Engine
This is Rietveld 408576698