chrome/browser/ui/webui/chromeos/login/network_dropdown.cc - Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset

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 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/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 bae9a5d37efe30d602d35f9e65aa63b598a60ea3..ed64f17ffb4d2678393b630925331e28899361e2 100644

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

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

@@ -164,7 +164,7 @@ void NetworkDropdown::SetNetworkIconAndText() {

SkBitmap icon_bitmap = icon_image.GetRepresentation(

ui::GetScaleFactorFromScale(web_ui_->GetDeviceScale())).sk_bitmap();

std::string icon_str =

- icon_image.empty() ?

+ icon_image.isNull() ?

std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);

base::StringValue title(text);

base::StringValue icon(icon_str);