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

Unified Diff: chrome/browser/ui/panels/panel_browser_frame_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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/ui/panels/panel_browser_frame_view.cc
diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc
index 61489a89f029523af3676e585985464274d7a268..6f181f626bd7fcc9b5264b3844fabbdeab5f4c66 100644
--- a/chrome/browser/ui/panels/panel_browser_frame_view.cc
+++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc
@@ -110,16 +110,16 @@ const SkColor kBorderColor = 0xc0000000;
const SkColor kDividerColor = 0xffb5b5b5;
struct ButtonResources {
- SkBitmap* normal_image;
- SkBitmap* hover_image;
+ gfx::ImageSkia* normal_image;
+ gfx::ImageSkia* hover_image;
string16 tooltip_text;
ButtonResources(int normal_image_id, int hover_image_id, int tooltip_id)
: normal_image(NULL),
hover_image(NULL) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- normal_image = rb.GetBitmapNamed(normal_image_id);
- hover_image = rb.GetBitmapNamed(hover_image_id);
+ normal_image = rb.GetImageSkiaNamed(normal_image_id);
+ hover_image = rb.GetImageSkiaNamed(hover_image_id);
tooltip_text = l10n_util::GetStringUTF16(tooltip_id);
}
};
« no previous file with comments | « chrome/browser/first_run/try_chrome_dialog_view.cc ('k') | chrome/browser/ui/tests/ui_gfx_image_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698