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

Unified Diff: chrome/browser/background/background_mode_manager.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/background/background_mode_manager.cc
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 76d079d86d106022f6847c671b874bb82a5581fa..e5c5314f29cb9624ad9eb507ea81d106091a94de 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -117,7 +117,7 @@ void BackgroundModeManager::BackgroundModeData::BuildProfileMenu(
applications_->begin();
cursor != applications_->end();
++cursor, ++position) {
- const SkBitmap* icon = applications_->GetIcon(*cursor);
+ const gfx::ImageSkia* icon = applications_->GetIcon(*cursor);
DCHECK(position == applications_->GetPosition(*cursor));
const std::string& name = (*cursor)->name();
menu->AddItem(position, UTF8ToUTF16(name));
@@ -663,9 +663,9 @@ void BackgroundModeManager::CreateStatusTrayIcon() {
// Set the image and add ourselves as a click observer on it.
// TODO(rlp): Status tray icon should have submenus for each profile.
- SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
- IDR_STATUS_TRAY_ICON);
- status_icon_->SetImage(*bitmap);
+ gfx::ImageSkia* image_skia = ResourceBundle::GetSharedInstance().
+ GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
+ status_icon_->SetImage(*image_skia);
status_icon_->SetToolTip(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
UpdateStatusTrayIconContextMenu();
}

Powered by Google App Engine
This is Rietveld 408576698