ash/system/tray_accessibility.cc - 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_accessibility.cc

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: 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: ash/system/tray_accessibility.cc

diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc

index 7d76748f797aabf693883ad83471ea581183fbfc..08e173eb773053de0a4930c4019787d90ec4f0ba 100644

--- a/ash/system/tray_accessibility.cc

+++ b/ash/system/tray_accessibility.cc

@@ -32,7 +32,7 @@ class DefaultAccessibilityView : public ActionableView {

FixedSizedImageView* image =

new FixedSizedImageView(0, kTrayPopupItemHeight);

image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).

- ToSkBitmap());

+ ToImageSkia());

AddChildView(image);

string16 label = bundle.GetLocalizedString(

@@ -92,7 +92,7 @@ views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

views::ImageView* image = new views::ImageView;

image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).

- ToSkBitmap());

+ ToImageSkia());

detailed_->AddChildView(image);

detailed_->AddChildView(new views::Label(

« no previous file with comments | « ash/system/tray/tray_views.cc ('k') | ash/system/tray_caps_lock.cc » ('j') | no next file with comments »