chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc - Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

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/browser_actions_toolbar_gtk.cc

Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Another day, another rebase Created 8 years, 4 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:

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

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

index 77a93af585ad9be2e552c60eab4f5f78aa087fee..f60b19b2324e6f40024199209eae0d6f7d1eb7f7 100644

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

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

@@ -249,9 +249,9 @@ class BrowserActionButton : public content::NotificationObserver,

gtk_widget_queue_draw(button());

}

- gfx::ImageSkia GetIcon() {

- return *extension_->browser_action()->GetIcon(

- toolbar_->GetCurrentTabId()).ToImageSkia();

+ gfx::Image GetIcon() {

+ return extension_->browser_action()->GetIcon(

+ toolbar_->GetCurrentTabId());

}

MenuGtk* GetContextMenu() {