Chromium Code Reviews| Index: ui/gfx/android/java_bitmap.h |
| diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h |
| index 34cd26af63d5e1f7e0d7813c14007c73446e2204..8ca9376e9404548bb0bff59faa44c71eef210a9b 100644 |
| --- a/ui/gfx/android/java_bitmap.h |
| +++ b/ui/gfx/android/java_bitmap.h |
| @@ -17,9 +17,11 @@ namespace gfx { |
| // way that ensures they're always the same than their Java counterpart. |
| enum BitmapConfig { |
|
Yaron
2014/08/20 05:52:02
What about files that have multiple enums defined?
Yaron
2014/08/20 05:52:02
Shouldn't this be BitmapFormat? I guess that's ort
mkosiba (inactive)
2014/09/02 16:00:57
Done.
|
| -#define DEFINE_BITMAP_CONFIG(x, y) BITMAP_##x = y, |
| -#include "bitmap_config_list.h" |
| -#undef DEFINE_BITMAP_CONFIG |
| + BITMAP_FORMAT_NO_CONFIG, |
| + BITMAP_FORMAT_ALPHA_8, |
| + BITMAP_FORMAT_ARGB_4444, |
| + BITMAP_FORMAT_ARGB_8888, |
| + BITMAP_FORMAT_RGB_565, |
| }; |
| // This class wraps a JNI AndroidBitmap object to make it easier to use. It |