chrome/browser/ui/webui/chromeos/login/network_dropdown.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/webui/chromeos/login/network_dropdown.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/webui/chromeos/login/network_dropdown.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

index cfb2a1bc532e8ecb4744910dc12bd83d36b50726..cad8a9b91a8a177774893c09afc40a613a276cd6 100644

--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

@@ -74,7 +74,7 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {

base::DictionaryValue* item = new base::DictionaryValue();

item->SetInteger("id", id);

item->SetString("label", model->GetLabelAt(i));

- SkBitmap icon;

+ gfx::ImageSkia icon;

if (model->GetIconAt(i, &icon))

item->SetString("icon", web_ui_util::GetImageDataUrl(icon));

if (id >= 0) {

« no previous file with comments | « chrome/browser/ui/views/wrench_menu.cc ('k') | ui/base/models/menu_model.h » ('j') | ui/base/models/table_model.cc » ('J')