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

Unified Diff: ui/ui.gyp

Issue 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia
Patch Set: Cleanup. Created 8 years, 3 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: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index b0b418f4d55c91c23cca71b29754908a416ac61a..938dcdfa776c0d8aff7603484a63140f81cf5444 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -41,6 +41,8 @@
# iOS uses a small subset of ui. common_sources are the only files that
# are built on iOS.
'common_sources' : [
+ 'base/layout.cc',
+ 'base/layout.h',
'base/models/tree_node_iterator.h',
'base/models/tree_node_model.h',
'base/ui_base_paths.cc',
@@ -48,6 +50,21 @@
'base/ui_base_switches.cc',
'base/ui_base_switches.h',
'base/ui_export.h',
+ 'gfx/image/image.cc',
+ 'gfx/image/image.h',
+ 'gfx/image/image_ios.mm',
+ 'gfx/image/image_mac.mm',
+ 'gfx/image/image_skia.cc',
+ 'gfx/image/image_skia.h',
+ 'gfx/image/image_skia_operations.cc',
+ 'gfx/image/image_skia_operations.h',
+ 'gfx/image/image_skia_rep.cc',
+ 'gfx/image/image_skia_rep.h',
+ 'gfx/image/image_skia_source.h',
+ 'gfx/image/image_skia_util_ios.h',
+ 'gfx/image/image_skia_util_ios.mm',
+ 'gfx/image/image_skia_util_mac.h',
+ 'gfx/image/image_skia_util_mac.mm',
'gfx/insets.cc',
'gfx/insets.h',
'gfx/point.cc',
@@ -261,8 +278,6 @@
'base/l10n/l10n_util_posix.cc',
'base/l10n/l10n_util_win.cc',
'base/l10n/l10n_util_win.h',
- 'base/layout.cc',
- 'base/layout.h',
'base/layout_mac.mm',
'base/models/button_menu_item_model.cc',
'base/models/button_menu_item_model.h',
@@ -416,18 +431,6 @@
'gfx/gfx_paths.h',
'gfx/image/canvas_image_source.cc',
'gfx/image/canvas_image_source.h',
- 'gfx/image/image.cc',
- 'gfx/image/image.h',
- 'gfx/image/image_mac.mm',
- 'gfx/image/image_skia.cc',
- 'gfx/image/image_skia.h',
- 'gfx/image/image_skia_operations.cc',
- 'gfx/image/image_skia_operations.h',
- 'gfx/image/image_skia_rep.cc',
- 'gfx/image/image_skia_rep.h',
- 'gfx/image/image_skia_source.h',
- 'gfx/image/image_skia_util_mac.h',
- 'gfx/image/image_skia_util_mac.mm',
'gfx/image/image_util.cc',
'gfx/image/image_util.h',
'gfx/interpolated_transform.h',

Powered by Google App Engine
This is Rietveld 408576698