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

Unified Diff: chrome/browser/ui/global_error/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: safety third 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/ui/global_error/global_error.cc
diff --git a/chrome/browser/ui/global_error/global_error.cc b/chrome/browser/ui/global_error/global_error.cc
index fce33ef384749b15f8e30ab461166dca579d443e..f6388459bfaeba677f64f5f1f16eba4b840ac34d 100644
--- a/chrome/browser/ui/global_error/global_error.cc
+++ b/chrome/browser/ui/global_error/global_error.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
#include "grit/theme_resources.h"
+#include "ui/gfx/image/image.h"
GlobalError::GlobalError()
: has_shown_bubble_view_(false),
@@ -45,6 +46,10 @@ GlobalErrorBubbleViewBase* GlobalError::GetBubbleView() {
return bubble_view_;
}
+gfx::Image* GlobalError::GetBubbleViewCustomIcon() {
+ return NULL;
+}
+
int GlobalError::GetBubbleViewIconResourceID() {
// If you change this make sure to also change the menu icon and the wrench
// icon color.

Powered by Google App Engine
This is Rietveld 408576698