ash/system/tray/system_tray_delegate.h - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::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: ash/system/tray/system_tray_delegate.h

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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: ash/system/tray/system_tray_delegate.h

diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h

index f1ace425c22a38ac778fc66e918667910b131456..6e2c77caa440f39704459cb2dd93f6bd3726f6bc 100644

--- a/ash/system/tray/system_tray_delegate.h

+++ b/ash/system/tray/system_tray_delegate.h

@@ -16,8 +16,7 @@

#include "base/i18n/time_formatting.h"

#include "base/string16.h"

#include "third_party/skia/include/core/SkBitmap.h"

-class SkBitmap;

+#include "ui/gfx/image/image_skia.h"

namespace ash {

@@ -27,7 +26,7 @@ struct ASH_EXPORT NetworkIconInfo {

bool highlight;

bool tray_icon_visible;

- SkBitmap image;

+ gfx::ImageSkia image;

string16 name;

string16 description;

std::string service_path;

« ash/system/audio/tray_volume.cc ('K') | « ash/system/settings/tray_settings.cc ('k') | ash/system/tray/tray_image_item.cc » ('j') | no next file with comments »