summaryrefslogtreecommitdiffstats
path: root/chrome/browser/media
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/media')
-rw-r--r--chrome/browser/media/media_stream_capture_indicator.cc4
-rw-r--r--chrome/browser/media/media_stream_capture_indicator.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc
index e3e8ad0..55f6751 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);
}
}
diff --git a/chrome/browser/media/media_stream_capture_indicator.h b/chrome/browser/media/media_stream_capture_indicator.h
index 88efcda..588707a 100644
--- a/chrome/browser/media/media_stream_capture_indicator.h
+++ b/chrome/browser/media/media_stream_capture_indicator.h
@@ -6,13 +6,13 @@
#define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
#pragma once
-#include <vector>
#include <string>
+#include <vector>
#include "base/memory/ref_counted.h"
#include "content/public/common/media_stream_request.h"
-#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/models/simple_menu_model.h"
+#include "ui/gfx/image/image_skia.h"
class StatusIcon;
class StatusTray;
@@ -130,9 +130,9 @@ class MediaStreamCaptureIndicator
StatusIcon* status_icon_;
// Icon to be displayed on the status tray.
- SkBitmap tray_image_;
+ gfx::ImageSkia tray_image_;
- SkBitmap balloon_image_;
+ gfx::ImageSkia balloon_image_;
// A list that contains the usage information of the opened capture devices.
typedef std::vector<CaptureDeviceTab> CaptureDeviceTabs;