chrome/browser/media/media_stream_capture_indicator.cc - Issue 10453101: Convert most of the rest of chrome 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/media/media_stream_capture_indicator.cc

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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/media/media_stream_capture_indicator.cc

diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc

index e3e8ad0d9ec0599fcd077ef4c469974cf0b96437..55f675187a75b6d03efdafe8b405c6cd53b193b8 100644

--- a/chrome/browser/media/media_stream_capture_indicator.cc

+++ b/chrome/browser/media/media_stream_capture_indicator.cc

@@ -159,11 +159,11 @@ void MediaStreamCaptureIndicator::CreateStatusTray() {

void MediaStreamCaptureIndicator::EnsureStatusTrayIcon() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

if (tray_image_.empty()) {

- tray_image_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed(

+ tray_image_ = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

IDR_MEDIA_STREAM_CAPTURE_LED);

}

if (balloon_image_.empty()) {

- balloon_image_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed(

+ balloon_image_ = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

IDR_PRODUCT_LOGO_32);

}