chrome/browser/ui/gtk/global_error_bubble.cc - Issue 15745022: Add custom icon support to GlobalError. Show extension icon in permissions increase bubble.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/global_error_bubble.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

« chrome/browser/ui/global_error/global_error.h ('K') | « chrome/browser/ui/global_error/global_error.cc ('k') | chrome/browser/ui/views/global_error_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/global_error_bubble.cc

diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc

index af320824f8f97152731fd38c2f309fa246663611..4de6dc401c8b611a6127edad23ab52615e7f9846 100644

--- a/chrome/browser/ui/gtk/global_error_bubble.cc

+++ b/chrome/browser/ui/gtk/global_error_bubble.cc

@@ -48,9 +48,13 @@ GlobalErrorBubble::GlobalErrorBubble(Browser* browser,

GtkThemeService* theme_service =

GtkThemeService::GetFrom(browser_->profile());

- int resource_id = error_->GetBubbleViewIconResourceID();

- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

- GdkPixbuf* pixbuf = rb.GetNativeImageNamed(resource_id).ToGdkPixbuf();

+ gfx::Image* image = error_->GetBubbleViewCustomIcon();

+ if (!image) {

+ int resource_id = error_->GetBubbleViewIconResourceID();

+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

+ image = &rb.GetNativeImageNamed(resource_id);

+ }

+ GdkPixbuf* pixbuf = image->ToGdkPixbuf();

GtkWidget* image_view = gtk_image_new_from_pixbuf(pixbuf);

GtkWidget* title_label = theme_service->BuildLabel(