diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 03:35:56 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 03:35:56 +0000 |
| commit | 09b21196f2668fb0dc2ebc630add31ac4c3ea956 (patch) | |
| tree | 15a8c854bde4e516c5f02f0556dcf6fa67bbc7b8 /chrome/browser/ui/gtk/gtk_theme_service.h | |
| parent | 7bd7f0f2255048cc45e1297e499f19220d5d8745 (diff) | |
| download | chromium_src-09b21196f2668fb0dc2ebc630add31ac4c3ea956.zip chromium_src-09b21196f2668fb0dc2ebc630add31ac4c3ea956.tar.gz chromium_src-09b21196f2668fb0dc2ebc630add31ac4c3ea956.tar.bz2 | |
Revert 137068 - Revert 136812 - Get rid of Image::Image(SkBitmap*)
Bug=124566
Test=Compiles on CrOS,Mac
Review URL: https://chromiumcodereview.appspot.com/10378009
TBR=pkotwicz@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136813
Review URL: https://chromiumcodereview.appspot.com/10383153
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382166
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_theme_service.h')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_service.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/gtk_theme_service.h index d421ffb..0228c56 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. |