From 1dde36363bcf351fd04f06df6b6efd6216391e31 Mon Sep 17 00:00:00 2001 From: "pkotwicz@chromium.org" Date: Tue, 5 Jun 2012 15:51:00 +0000 Subject: Converted the rest of chrome except for extensions and favicons to user ImageSkia Used same conversion script as 10437006 Modified the following files afterwards: 1 chrome/browser/background/background_application_list_model.cc 2 chrome/browser/extensions/extension_install_ui.cc 3 chrome/browser/extensions/extension_install_ui.h 4 chrome/browser/speech/speech_recognition_bubble.cc 5 chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc 6 chrome/browser/speech/speech_recognition_bubble_gtk.cc 7 chrome/browser/speech/speech_recognition_tray_icon_controller.h 8 chrome/browser/task_manager/task_manager_resource_providers.cc 9 chrome/browser/ui/panels/panel_browser_frame_view.cc 10 chrome/browser/ui/search_engines/template_url_table_model.cc 11 chrome/browser/ui/search_engines/template_url_table_model.h 12 chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc 13 chrome/browser/ui/views/avatar_menu_button.cc 14 chrome/browser/ui/views/detachable_toolbar_view.cc 15 chrome/browser/ui/views/download/download_item_view.cc 16 chrome/browser/ui/views/extensions/extension_install_dialog_view.cc 17 chrome/browser/ui/views/location_bar/icon_label_bubble_view.h 18 chrome/browser/ui/views/location_bar/location_bar_view.cc 19 chrome/browser/ui/views/tab_icon_view.cc 20 chrome/browser/ui/views/tab_icon_view.h 21 chrome/browser/ui/views/tabs/tab_strip.cc Include, whitespace changes in 1 chrome/browser/automation/automation_provider_observers.cc 2 chrome/browser/background/background_application_list_model.h 3 chrome/browser/background/background_mode_manager.cc 4 chrome/browser/custom_home_pages_table_model.h 5 chrome/browser/download/download_util.cc 6 chrome/browser/extensions/extension_function_dispatcher.cc 7 chrome/browser/extensions/extension_install_dialog.cc 8 chrome/browser/extensions/extension_install_dialog.h 9 chrome/browser/ntp_background_util.cc 10 chrome/browser/speech/speech_recognition_bubble.h 11 chrome/browser/task_manager/task_manager.h 12 chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc 13 chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc 14 chrome/browser/ui/cocoa/task_manager_mac.h 15 chrome/browser/ui/views/about_chrome_view.cc 16 chrome/browser/ui/views/avatar_menu_bubble_view.cc 17 chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc 18 chrome/browser/ui/views/download/download_item_view.h 19 chrome/browser/ui/views/find_bar_view.cc 20 chrome/browser/ui/views/infobars/extension_infobar.cc 21 chrome/browser/ui/views/notifications/balloon_view.cc 22 chrome/browser/ui/views/page_info_bubble_view.cc 23 chrome/browser/ui/views/tabs/base_tab.cc 24 chrome/browser/ui/views/tabs/tab.cc 25 chrome/browser/ui/views/toolbar_view.cc Review URL: https://chromiumcodereview.appspot.com/10453101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140531 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/media/media_stream_capture_indicator.cc | 4 ++-- chrome/browser/media/media_stream_capture_indicator.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome/browser/media') 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 #include +#include #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 CaptureDeviceTabs; -- cgit v1.1