Normalize the top-level ui/ module.

ui/ui_gfx.gypi

Index: ui/ui_gfx.gypi
diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi
new file mode 100644
index 0000000000000000000000000000000000000000..b3ce611814e66b933f91575fac3fda381aac7806
--- /dev/null
+++ b/ui/ui_gfx.gypi
@@ -0,0 +1,217 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'grit_info_cmd': ['python', '../tools/grit/grit_info.py',
+                      '<@(grit_defines)'],
+    'grit_cmd': ['python', '../tools/grit/grit.py'],
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx',
+  },
+  'targets': [
+    {
+      # TODO(rsesek): Remove this target once ui_unittests is run on the
+      # waterfall instead of gfx_unittests.
+      'target_name': 'gfx_unittests',
+      'type': 'none',
+      'msvs_guid': '1D386FA9-2501-41E2-8FE8-527DAF479CE6',
+      'dependencies': [
+        'ui_unittests',
+      ],
+      'actions': [
+        {
+          'message': 'TEMPORARY: Copying ui_unittests to gfx_unittests',

[Nico, 2011/07/04 21:14:46]

Is there a bug for this, or any eta? I just lost a few minutes to this.

Is http://codereview.chromium.org/7212022/ something we would want? I wrote it
before finding this comment; now I'm not sure.

+          'variables': {
+            'ui_copy_target': '<(PRODUCT_DIR)/ui_unittests<(EXECUTABLE_SUFFIX)',
+            'ui_copy_dest': '<(PRODUCT_DIR)/gfx_unittests<(EXECUTABLE_SUFFIX)',
+          },
+          'inputs': ['<(ui_copy_target)'],
+          'outputs': ['<(ui_copy_dest)'],
+          'action_name': 'TEMP_copy_ui_unittests',
+          'action': [
+            'python', '-c',
+            'import os, shutil, stat; ' \
+            'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
+            'os.chmod(\'<(ui_copy_dest)\', ' \
+                'stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)'
+          ]
+        }
+      ],
+    },
+    {
+      'target_name': 'ui_gfx',
+      'type': '<(library)',
+      'msvs_guid': '13A8D36C-0467-4B4E-BAA3-FD69C45F076A',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
+        '../skia/skia.gyp:skia',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libpng/libpng.gyp:libpng',
+        '../third_party/zlib/zlib.gyp:zlib',
+        'gfx_resources',
+        '<(libjpeg_gyp_path):libjpeg',
+      ],
+      'sources': [
+        'gfx/blit.cc',
+        'gfx/blit.h',
+        'gfx/brush.h',
+        'gfx/canvas.cc',
+        'gfx/canvas.h',
+        'gfx/canvas_skia.h',
+        'gfx/canvas_skia.cc',
+        'gfx/canvas_skia_linux.cc',
+        'gfx/canvas_skia_mac.mm',
+        'gfx/canvas_skia_paint.h',
+        'gfx/canvas_skia_win.cc',
+        'gfx/codec/jpeg_codec.cc',
+        'gfx/codec/jpeg_codec.h',
+        'gfx/codec/png_codec.cc',
+        'gfx/codec/png_codec.h',
+        'gfx/color_utils.cc',
+        'gfx/color_utils.h',
+        'gfx/compositor.cc',
+        'gfx/compositor_gl.cc',
+        'gfx/compositor.h',
+        'gfx/favicon_size.h',
+        'gfx/font.h',
+        'gfx/font.cc',
+        'gfx/gfx_paths.cc',
+        'gfx/gfx_paths.h',
+        'gfx/gfx_module.cc',
+        'gfx/gfx_module.h',
+        'gfx/image.cc',
+        'gfx/image.h',
+        'gfx/image_mac.mm',
+        'gfx/insets.cc',
+        'gfx/insets.h',
+        'gfx/native_widget_types.h',
+        'gfx/path.cc',
+        'gfx/path.h',
+        'gfx/path_gtk.cc',
+        'gfx/path_win.cc',
+        'gfx/platform_font.h',
+        'gfx/platform_font_gtk.h',
+        'gfx/platform_font_gtk.cc',
+        'gfx/platform_font_mac.h',
+        'gfx/platform_font_mac.mm',
+        'gfx/platform_font_win.h',
+        'gfx/platform_font_win.cc',
+        'gfx/point.cc',
+        'gfx/point.h',
+        'gfx/rect.cc',
+        'gfx/rect.h',
+        'gfx/scoped_cg_context_state_mac.h',
+        'gfx/scrollbar_size.cc',
+        'gfx/scrollbar_size.h',
+        'gfx/size.cc',
+        'gfx/size.h',
+        'gfx/skbitmap_operations.cc',
+        'gfx/skbitmap_operations.h',
+        'gfx/skia_util.cc',
+        'gfx/skia_util.h',
+        'gfx/skia_utils_gtk.cc',
+        'gfx/skia_utils_gtk.h',
+        'gfx/transform.h',
+        'gfx/transform_skia.cc',
+        'gfx/transform_skia.h',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'sources': [
+            'gfx/canvas_direct2d.cc',
+            'gfx/canvas_direct2d.h',
+            'gfx/gdi_util.cc',
+            'gfx/gdi_util.h',
+            'gfx/icon_util.cc',
+            'gfx/icon_util.h',
+            'gfx/native_theme_win.cc',
+            'gfx/native_theme_win.h',
+            'gfx/win_util.cc',
+            'gfx/win_util.h',
+          ],
+          'include_dirs': [
+            '../',
+            '../third_party/wtl/include',
+          ],
+        }],
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'dependencies': [
+            # font_gtk.cc uses fontconfig.
+            # TODO(evanm): I think this is wrong; it should just use GTK.
+            '../build/linux/system.gyp:fontconfig',
+            '../build/linux/system.gyp:gtk',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lGL',
+            ],
+          },
+          'sources!': [
+            'gfx/compositor.cc',
+          ],
+          'sources': [
+            'gfx/gtk_native_view_id_manager.cc',
+            'gfx/gtk_native_view_id_manager.h',
+            'gfx/gtk_preserve_window.cc',
+            'gfx/gtk_preserve_window.h',
+            'gfx/gtk_util.cc',
+            'gfx/gtk_util.h',
+            'gfx/native_theme_linux.cc',
+            'gfx/native_theme_linux.h',
+            'gfx/native_widget_types_gtk.cc',
+          ],
+        }, {
+          'sources!': [
+            'gfx/compositor_gl.cc',
+          ]
+        }],
+      ],
+    },
+    {
+      'target_name': 'gfx_resources',
+      'type': 'none',
+      'msvs_guid' : '5738AE53-E919-4987-A2EF-15FDBD8F90F6',
+      'actions': [
+        {
+          'action_name': 'gfx_resources',
+          'variables': {
+            'input_path': 'gfx/gfx_resources.grd',
+          },
+          'inputs': [
+            '<!@(<(grit_info_cmd) --inputs <(input_path))',
+          ],
+          'outputs': [
+            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
+          ],
+          'action': [
+            '<@(grit_cmd)',
+            '-i', '<(input_path)', 'build',
+            '-o', '<(grit_out_dir)',
+            '<@(grit_defines)',
+          ],
+          'message': 'Generating resources from <(input_path)',
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(grit_out_dir)',
+        ],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },
+
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2: