diff options
| author | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 13:59:53 +0000 |
|---|---|---|
| committer | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 13:59:53 +0000 |
| commit | f39010e5916577e92ecb994660490232d925371d (patch) | |
| tree | 7cb6a1bafdb8dddd6d022d65f13b553876e20495 /ui | |
| parent | 5b14a71b29d0c6c74cee635eb026cc7fcc6e04a6 (diff) | |
| download | chromium_src-f39010e5916577e92ecb994660490232d925371d.zip chromium_src-f39010e5916577e92ecb994660490232d925371d.tar.gz chromium_src-f39010e5916577e92ecb994660490232d925371d.tar.bz2 | |
More bring up of ui code on iOS.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11027058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.gyp | 20 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 8 |
2 files changed, 14 insertions, 14 deletions
@@ -68,8 +68,16 @@ 'base/ui_base_switches.cc', 'base/ui_base_switches.h', 'base/ui_export.h', + 'gfx/color_utils.cc', + 'gfx/color_utils.h', + 'gfx/display.cc', + 'gfx/display.h', + 'gfx/favicon_size.cc', + 'gfx/favicon_size.h', 'gfx/font.cc', 'gfx/font.h', + 'gfx/gfx_paths.cc', + 'gfx/gfx_paths.h', 'gfx/image/image.cc', 'gfx/image/image.h', 'gfx/image/image_ios.mm', @@ -137,6 +145,8 @@ 'gfx/size_base.h', 'gfx/size_f.cc', 'gfx/size_f.h', + 'gfx/skbitmap_operations.cc', + 'gfx/skbitmap_operations.h', 'gfx/skia_util.cc', 'gfx/skia_util.h', 'gfx/skia_utils_gtk.cc', @@ -460,12 +470,6 @@ 'gfx/color_profile.h', 'gfx/color_profile_mac.cc', 'gfx/color_profile_win.cc', - 'gfx/color_utils.cc', - 'gfx/color_utils.h', - 'gfx/display.cc', - 'gfx/display.h', - 'gfx/favicon_size.cc', - 'gfx/favicon_size.h', 'gfx/font_fallback_win.cc', 'gfx/font_fallback_win.h', 'gfx/font_list.cc', @@ -475,8 +479,6 @@ 'gfx/font_render_params_linux.h', 'gfx/font_smoothing_win.cc', 'gfx/font_smoothing_win.h', - 'gfx/gfx_paths.cc', - 'gfx/gfx_paths.h', 'gfx/image/canvas_image_source.cc', 'gfx/image/canvas_image_source.h', 'gfx/mac/nsimage_cache.h', @@ -504,8 +506,6 @@ 'gfx/scrollbar_size.h', 'gfx/selection_model.cc', 'gfx/selection_model.h', - 'gfx/skbitmap_operations.cc', - 'gfx/skbitmap_operations.h', 'gfx/sys_color_change_listener.cc', 'gfx/sys_color_change_listener.h', 'gfx/text_constants.h', diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 24e2f69..2103b22 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -66,6 +66,8 @@ 'base/animation/slide_animation_unittest.cc', 'base/layout_unittest.cc', 'base/models/tree_node_iterator_unittest.cc', + 'gfx/color_utils_unittest.cc', + 'gfx/display_unittest.cc', 'gfx/font_unittest.cc', 'gfx/image/image_skia_unittest.cc', 'gfx/image/image_unittest.cc', @@ -75,7 +77,9 @@ 'gfx/image/image_unittest_util_mac.mm', 'gfx/insets_unittest.cc', 'gfx/rect_unittest.cc', + 'gfx/screen_unittest.cc', 'gfx/shadow_value_unittest.cc', + 'gfx/skbitmap_operations_unittest.cc', 'gfx/skia_util_unittest.cc', ], 'all_sources': [ @@ -113,15 +117,11 @@ 'gfx/codec/jpeg_codec_unittest.cc', 'gfx/codec/png_codec_unittest.cc', 'gfx/color_analysis_unittest.cc', - 'gfx/color_utils_unittest.cc', - 'gfx/display_unittest.cc', 'gfx/font_list_unittest.cc', 'gfx/image/image_mac_unittest.mm', 'gfx/image/image_util_unittest.cc', 'gfx/platform_font_mac_unittest.mm', 'gfx/render_text_unittest.cc', - 'gfx/screen_unittest.cc', - 'gfx/skbitmap_operations_unittest.cc', 'gfx/transform_util_unittest.cc', 'gfx/video_decode_acceleration_support_mac_unittest.mm', 'test/run_all_unittests.cc', |