Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5375)

Unified Diff: chrome/browser/media/media_stream_capture_indicator.h

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_capture_indicator.h
diff --git a/chrome/browser/media/media_stream_capture_indicator.h b/chrome/browser/media/media_stream_capture_indicator.h
index 88efcda56927a4ea97da32eb6fa54697914e58b4..588707ac46a90e1775675ec70a97043a717bad44 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;
« no previous file with comments | « chrome/browser/extensions/extension_uninstall_dialog.cc ('k') | chrome/browser/media/media_stream_capture_indicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698