diff options
| author | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 18:13:11 +0000 |
|---|---|---|
| committer | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 18:13:11 +0000 |
| commit | 2063b8b0c4e9933cf152cca470c247a94de0bb04 (patch) | |
| tree | d227fa5ca18f5817289a7508adb38ebb71030e87 /ui | |
| parent | 96c7005f2d85921994c8a800ab08dea1afc0ab81 (diff) | |
| download | chromium_src-2063b8b0c4e9933cf152cca470c247a94de0bb04.zip chromium_src-2063b8b0c4e9933cf152cca470c247a94de0bb04.tar.gz chromium_src-2063b8b0c4e9933cf152cca470c247a94de0bb04.tar.bz2 | |
Build more ui/ code on iOS.
This CL enables a small set of files and their associated tests to be compiled on iOS. These files do not need any change to be enabled on the platform.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10909027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.gyp | 14 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 2 |
2 files changed, 8 insertions, 8 deletions
@@ -43,6 +43,13 @@ 'common_sources' : [ 'base/models/tree_node_iterator.h', 'base/models/tree_node_model.h', + 'base/ui_base_paths.cc', + 'base/ui_base_paths.h', + 'base/ui_base_switches.cc', + 'base/ui_base_switches.h', + 'base/ui_export.h', + 'gfx/insets.cc', + 'gfx/insets.h', 'gfx/point.cc', 'gfx/point.h', 'gfx/point_base.h', @@ -307,12 +314,7 @@ 'base/touch/touch_factory.cc', 'base/touch/touch_factory.h', 'base/ui_base_exports.cc', - 'base/ui_base_paths.cc', - 'base/ui_base_paths.h', - 'base/ui_base_switches.cc', - 'base/ui_base_switches.h', 'base/ui_base_types.h', - 'base/ui_export.h', 'base/view_prop.cc', 'base/view_prop.h', 'base/win/accessibility_misc_utils.h', @@ -418,8 +420,6 @@ 'gfx/image/image_skia_util_mac.mm', 'gfx/image/image_util.cc', 'gfx/image/image_util.h', - 'gfx/insets.cc', - 'gfx/insets.h', 'gfx/interpolated_transform.h', 'gfx/interpolated_transform.cc', 'gfx/mac/nsimage_cache.h', diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 96395f3..cb299a3 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -58,6 +58,7 @@ # are built on iOS. 'common_sources' : [ 'base/models/tree_node_iterator_unittest.cc', + 'gfx/insets_unittest.cc', ], 'all_sources': [ '<@(_common_sources)', @@ -109,7 +110,6 @@ 'gfx/image/image_unittest_util.h', 'gfx/image/image_unittest_util_mac.mm', 'gfx/image/image_util_unittest.cc', - 'gfx/insets_unittest.cc', 'gfx/rect_unittest.cc', 'gfx/render_text_unittest.cc', 'gfx/screen_unittest.cc', |