chrome/browser/ui/gtk/menu_gtk.cc - Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to 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/menu_gtk.cc

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 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/gtk/menu_gtk.cc

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

index b58abe880b1aee97c4b9a7f4dccb006e9751a3a8..4d9ad426e10934b7e6be2c2374efe11a86d7eb4d 100644

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

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

@@ -445,7 +445,7 @@ void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) {

std::map<int, GtkWidget*> radio_groups;

GtkWidget* menu_item = NULL;

for (int i = 0; i < model->GetItemCount(); ++i) {

- SkBitmap icon;

+ gfx::ImageSkia icon;

std::string label = ui::ConvertAcceleratorsFromWindowsStyle(

UTF16ToUTF8(model->GetLabelAt(i)));

bool connect_to_activate = true;

@@ -876,7 +876,7 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {

gtk_menu_item_set_label(GTK_MENU_ITEM(widget), label.c_str());

if (GTK_IS_IMAGE_MENU_ITEM(widget)) {

- SkBitmap icon;

+ gfx::ImageSkia icon;

if (model->GetIconAt(id, &icon)) {

GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(icon);

gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget),

« no previous file with comments | « chrome/browser/ui/gtk/gtk_tree.cc ('k') | chrome/browser/ui/search_engines/template_url_table_model.h » ('j') | ui/base/models/table_model.cc » ('J')