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

Unified Diff: chrome/browser/ui/gtk/gtk_theme_service.h

Issue 10378009: Get rid of Image::Image(SkBitmap*) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: k 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/gtk/gtk_theme_service.h
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/gtk_theme_service.h
index 0228c560e049fdcbd51fd334463606f059098b4d..d421ffb17183ea482f047a0bb49bc0b2e2bc564b 100644
--- a/chrome/browser/ui/gtk/gtk_theme_service.h
+++ b/chrome/browser/ui/gtk/gtk_theme_service.h
@@ -196,21 +196,21 @@ class GtkThemeService : public ThemeService {
void FreeIconSets();
// Lazily generates each bitmap used in the gtk theme.
- SkBitmap* GenerateGtkThemeBitmap(int id) const;
+ SkBitmap GenerateGtkThemeBitmap(int id) const;
// Creates a GTK+ version of IDR_THEME_FRAME. Instead of tinting, this
// creates a theme configurable gradient ending with |color_id| at the
// bottom, and |gradient_name| at the top if that color is specified in the
// theme.
- SkBitmap* GenerateFrameImage(int color_id,
- const char* gradient_name) const;
+ SkBitmap GenerateFrameImage(int color_id,
+ const char* gradient_name) const;
// Takes the base frame image |base_id| and tints it with |tint_id|.
- SkBitmap* GenerateTabImage(int base_id) const;
+ SkBitmap GenerateTabImage(int base_id) const;
// Tints an icon based on tint.
- SkBitmap* GenerateTintedIcon(int base_id,
- const color_utils::HSL& tint) const;
+ SkBitmap GenerateTintedIcon(int base_id,
+ const color_utils::HSL& tint) const;
// Returns the tint for buttons that contrasts with the normal window
// background color.

Powered by Google App Engine
This is Rietveld 408576698