Normalize the top-level ui/ module.

This CL creates four .gypi files that are included in /ui/ui.gyp. This allows
for a single unittest binary for all the submodules, rather than having
individual unittest binaries for each submodule.

To not break the buildbot, this creates a fake target that copies ui_unittests
to gfx_unittests as temporary scaffolding.

BUG=72317
TEST=gfx_unittests (really ui_unittests) passes

Review URL: http://codereview.chromium.org/6688007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78711 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 553 insertions, 613 deletions

diff --git a/app/app_base.gypi b/app/app_base.gypi
index 9e98ce4..42253c5 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -63,7 +63,7 @@
         # target, but it doesn't work due to a bug in gyp
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
diff --git a/build/all.gyp b/build/all.gyp
index 633fa8cd..fcebd49 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -13,7 +13,7 @@
         '../base/base.gyp:*',
         '../chrome/browser/sync/tools/sync_tools.gyp:*',
         '../chrome/chrome.gyp:*',
-        '../ui/gfx/gfx.gyp:*',
+        '../ui/ui.gyp:*',
         '../gpu/gpu.gyp:*',
         '../gpu/demos/demos.gyp:*',
         '../ipc/ipc.gyp:*',
@@ -156,7 +156,7 @@
         '../chrome/chrome.gyp:sync_unit_tests',
         '../chrome/chrome.gyp:ui_tests',
         '../chrome/chrome.gyp:unit_tests',
-        '../ui/gfx/gfx.gyp:gfx_unittests',
+        '../ui/ui.gyp:gfx_unittests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
         '../jingle/jingle.gyp:notifier_unit_tests',
@@ -261,7 +261,7 @@
             '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
-            '../ui/gfx/gfx.gyp:gfx_unittests',
+            '../ui/ui.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:notifier_unit_tests',
@@ -291,7 +291,7 @@
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:url_fetch_test',
-            '../ui/gfx/gfx.gyp:gfx_unittests',
+            '../ui/ui.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:notifier_unit_tests',
@@ -333,7 +333,7 @@
             '../chrome/chrome.gyp:sync_unit_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:ui_tests',
-            '../ui/gfx/gfx.gyp:gfx_unittests',
+            '../ui/ui.gyp:gfx_unittests',
             '../jingle/jingle.gyp:notifier_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
           ],
@@ -377,7 +377,7 @@
             '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../courgette/courgette.gyp:courgette_unittests',
-            '../ui/gfx/gfx.gyp:gfx_unittests',
+            '../ui/ui.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:notifier_unit_tests',
@@ -479,7 +479,7 @@
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:url_fetch_test',
-            '../ui/gfx/gfx.gyp:gfx_unittests',
+            '../ui/ui.gyp:gfx_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:ffmpeg_tests',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 33e0eed..dbc8d0f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1440,7 +1440,7 @@
             '../third_party/qcms/qcms.gyp:*',
             '../third_party/sqlite/sqlite.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
-            '../ui/gfx/gfx.gyp:*',
+            '../ui/ui.gyp:*',
             '../webkit/support/webkit_support.gyp:*',
             '../webkit/webkit.gyp:*',
 
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index d53badd..0ebacf8 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -180,7 +180,7 @@
         'gpu_common',
         '../app/app.gyp:app_base',
         '../base/base.gyp:base',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../third_party/angle/src/build_angle.gyp:translator_glsl',
       ],
       'sources': [
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 49388ab..88d8266 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -124,7 +124,7 @@
       'target_name': 'chromoting_base',
       'type': '<(library)',
       'dependencies': [
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../media/media.gyp:media',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/libvpx/libvpx.gyp:libvpx_include',
@@ -512,7 +512,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index 8dfaa0a..0f452ba 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -96,7 +96,7 @@ class ChromeTests(object):
       "ui": self.TestUI,                "ui_tests": self.TestUI,
       "unit": self.TestUnit,            "unit_tests": self.TestUnit,
       "app": self.TestApp,              "app_unittests": self.TestApp,
-      "ui_base": self.TestUIBase,       "ui_base_unittests": self.TestUIBase,
+      "ui_unit": self.TestUIUnit,       "ui_unittests": self.TestUIUnit,
       "gfx": self.TestGfx,              "gfx_unittests": self.TestGfx,
     }
 
@@ -294,8 +294,8 @@ class ChromeTests(object):
   def TestApp(self):
     return self.SimpleTest("chrome", "app_unittests")
 
-  def TestUIBase(self):
-    return self.SimpleTest("chrome", "ui_base_unittests")
+  def TestUIUnit(self):
+    return self.SimpleTest("chrome", "ui_unittests")
 
   def TestGfx(self):
     return self.SimpleTest("chrome", "gfx_unittests")
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 4618778..9fc4709 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -264,8 +264,8 @@ class ChromeTests:
   def TestApp(self):
     return self.SimpleTest("chrome", "app_unittests")
 
-  def TestUIBase(self):
-    return self.SimpleTest("chrome", "ui_base_unittests")
+  def TestUIUnit(self):
+    return self.SimpleTest("chrome", "ui_unittests")
 
   def TestGfx(self):
     return self.SimpleTest("chrome", "gfx_unittests")
@@ -442,7 +442,7 @@ class ChromeTests:
     "ui": TestUI,                "ui_tests": TestUI,
     "unit": TestUnit,            "unit_tests": TestUnit,
     "app": TestApp,              "app_unittests": TestApp,
-    "ui_base": TestUIBase,       "ui_base_unittests": TestUIBase,
+    "ui_unit": TestUIUnit,       "ui_unittests": TestUIUnit,
     "gfx": TestGfx,              "gfx_unittests": TestGfx,
   }
 
diff --git a/ui/base/ui_base.gypi b/ui/base/ui_base.gypi
deleted file mode 100644
index 1d54c926..0000000
--- a/ui/base/ui_base.gypi
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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': {
-    'chromium_code': 1,
-  },
-  'target_defaults': {
-    'sources/': [
-      ['exclude', '/(cocoa|gtk|win)/'],
-      ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)\\.(cc|mm?)$'],
-      ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
-    ],
-    'conditions': [
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-        ['include', '/gtk/'],
-        ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
-        ['include', '/(gtk|x11)_[^/]*\\.cc$'],
-      ]}],
-      ['OS=="mac"', {'sources/': [
-        ['include', '/cocoa/'],
-        ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],
-      ]}, { # else: OS != "mac"
-        'sources/': [
-          ['exclude', '\\.mm?$'],
-        ],
-      }],
-      ['OS=="win"', {'sources/': [
-        ['include', '_(win)\\.cc$'],
-        ['include', '/win/'],
-        ['include', '/win_[^/]*\\.cc$'],
-      ]}],
-      ['touchui==0', {'sources/': [
-        ['exclude', 'event_x.cc$'],
-        ['exclude', 'native_menu_x.cc$'],
-        ['exclude', 'native_menu_x.h$'],
-        ['exclude', 'touchui/'],
-        ['exclude', '_(touch)\\.cc$'],
-      ]}],
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'ui_base',
-      'type': '<(library)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-      ],
-      # Export these dependencies since text_elider.h includes ICU headers.
-      'export_dependent_settings': [
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-      ],
-      'sources': [
-        'accessibility/accessibility_types.h',
-        'accessibility/accessible_view_state.h',
-        'accessibility/accessible_view_state.cc',
-        'animation/animation.cc',
-        'animation/animation.h',
-        'animation/animation_container.cc',
-        'animation/animation_container.h',
-        'animation/animation_container_element.h',
-        'animation/animation_container_observer.h',
-        'animation/animation_delegate.h',
-        'animation/linear_animation.cc',
-        'animation/linear_animation.h',
-        'animation/multi_animation.cc',
-        'animation/multi_animation.h',
-        'animation/slide_animation.cc',
-        'animation/slide_animation.h',
-        'animation/throb_animation.cc',
-        'animation/throb_animation.h',
-        'animation/tween.cc',
-        'animation/tween.h',
-        'clipboard/clipboard.cc',
-        'clipboard/clipboard.h',
-        'clipboard/clipboard_linux.cc',
-        'clipboard/clipboard_mac.mm',
-        'clipboard/clipboard_util_win.cc',
-        'clipboard/clipboard_util_win.h',
-        'clipboard/clipboard_win.cc',
-        'clipboard/scoped_clipboard_writer.cc',
-        'clipboard/scoped_clipboard_writer.h',
-        'range/range.cc',
-        'range/range.h',
-        'range/range.mm',
-      ],
-      'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:x11',
-            '../build/linux/system.gyp:xext',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'ui_base_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'ui_base',
-      ],
-      'sources': [
-        'animation/animation_container_unittest.cc',
-        'animation/animation_unittest.cc',
-        'animation/multi_animation_unittest.cc',
-        'animation/slide_animation_unittest.cc',
-        'clipboard/clipboard_unittest.cc',
-        'range/range_unittest.cc',
-        'range/range_unittest.mm',
-        'run_all_unittests.cc',
-        'test_suite.h',
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
deleted file mode 100644
index 2cfad23..0000000
--- a/ui/gfx/gfx.gyp
+++ /dev/null
@@ -1,253 +0,0 @@
-# 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': {
-    'chromium_code': 1,
-    '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': [
-    {
-      'target_name': 'gfx_unittests',
-      'type': 'executable',
-      'msvs_guid': 'C8BD2821-EAE5-4AC6-A0E4-F82CAC2956CC',
-      'dependencies': [
-        'gfx',
-        'gfx_resources',
-        '../../base/base.gyp:test_support_base',
-        '../../skia/skia.gyp:skia',
-        '../../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'blit_unittest.cc',
-        'codec/jpeg_codec_unittest.cc',
-        'codec/png_codec_unittest.cc',
-        'color_utils_unittest.cc',
-        'font_unittest.cc',
-        'image_unittest.cc',
-        'image_unittest.h',
-        'insets_unittest.cc',
-        'rect_unittest.cc',
-        'run_all_unittests.cc',
-        'skbitmap_operations_unittest.cc',
-        'test_suite.cc',
-        'test_suite.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'sources': [
-            # TODO(brettw) re-enable this when the dependencies on WindowImpl are fixed!
-            'canvas_direct2d_unittest.cc',
-            'icon_util_unittest.cc',
-            'native_theme_win_unittest.cc',
-          ],
-          'include_dirs': [
-            '../..',
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'DelayLoadDLLs': [
-                'd2d1.dll',
-                'd3d10_1.dll',
-              ],
-              'AdditionalDependencies': [
-                'd2d1.lib',
-                'd3d10_1.lib',
-              ],
-            },
-          }
-        }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-          'dependencies': [
-            '../../app/app.gyp:app_base',
-            '../../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': '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': [
-        'blit.cc',
-        'blit.h',
-        'brush.h',
-        'canvas.cc',
-        'canvas.h',
-        'canvas_skia.h',
-        'canvas_skia.cc',
-        'canvas_skia_linux.cc',
-        'canvas_skia_mac.mm',
-        'canvas_skia_paint.h',
-        'canvas_skia_win.cc',
-        'codec/jpeg_codec.cc',
-        'codec/jpeg_codec.h',
-        'codec/png_codec.cc',
-        'codec/png_codec.h',
-        'color_utils.cc',
-        'color_utils.h',
-        'compositor.cc',
-        'compositor_gl.cc',
-        'compositor.h',
-        'favicon_size.h',
-        'font.h',
-        'font.cc',
-        'gfx_paths.cc',
-        'gfx_paths.h',
-        'gfx_module.cc',
-        'gfx_module.h',
-        'image.cc',
-        'image.h',
-        'image_mac.mm',
-        'insets.cc',
-        'insets.h',
-        'native_widget_types.h',
-        'path.cc',
-        'path.h',
-        'path_gtk.cc',
-        'path_win.cc',
-        'platform_font.h',
-        'platform_font_gtk.h',
-        'platform_font_gtk.cc',
-        'platform_font_mac.h',
-        'platform_font_mac.mm',
-        'platform_font_win.h',
-        'platform_font_win.cc',
-        'point.cc',
-        'point.h',
-        'rect.cc',
-        'rect.h',
-        'scoped_cg_context_state_mac.h',
-        'scrollbar_size.cc',
-        'scrollbar_size.h',
-        'size.cc',
-        'size.h',
-        'skbitmap_operations.cc',
-        'skbitmap_operations.h',
-        'skia_util.cc',
-        'skia_util.h',
-        'skia_utils_gtk.cc',
-        'skia_utils_gtk.h',
-        'transform.h',
-        'transform_skia.cc',
-        'transform_skia.h',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'sources': [
-            'canvas_direct2d.cc',
-            'canvas_direct2d.h',
-            'gdi_util.cc',
-            'gdi_util.h',
-            'icon_util.cc',
-            'icon_util.h',
-            'native_theme_win.cc',
-            'native_theme_win.h',
-            'win_util.cc',
-            'win_util.h',
-          ],
-          'include_dirs': [
-            '../..',
-            '<(DEPTH)/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!': [
-            'compositor.cc',
-          ],
-          'sources': [
-            'gtk_native_view_id_manager.cc',
-            'gtk_native_view_id_manager.h',
-            'gtk_preserve_window.cc',
-            'gtk_preserve_window.h',
-            'gtk_util.cc',
-            'gtk_util.h',
-            'native_theme_linux.cc',
-            'native_theme_linux.h',
-            'native_widget_types_gtk.cc',
-          ],
-        }, {
-          'sources!': [
-            'compositor_gl.cc',
-          ]
-        }],
-      ],
-    },
-    {
-      # theme_resources also generates a .cc file, so it can't use the rules above.
-      'target_name': 'gfx_resources',
-      'type': 'none',
-      'msvs_guid' : '5738AE53-E919-4987-A2EF-15FDBD8F90F6',
-      'actions': [
-        {
-          'action_name': 'gfx_resources',
-          'variables': {
-            'input_path': '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:
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e289b0b..d2e700d 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -5,11 +5,12 @@
 {
   'variables': {
     'chromium_code': 1,
+    'toolkit_views2': 0,  # ui/views/ is an experimental framework on Windows.
   },
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
-      ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)\\.(cc|mm?)$'],
+      ['exclude', '_(cocoa|gtk|linux|mac|posix|win|x)\\.(cc|mm?)$'],
       ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
     ],
     'conditions': [
@@ -26,10 +27,16 @@
           ['exclude', '\\.mm?$'],
         ],
       }],
-      ['OS=="win"', {'sources/': [
-        ['include', '_(win)\\.cc$'],
-        ['include', '/win/'],
-        ['include', '/win_[^/]*\\.cc$'],
+      ['OS=="win"',
+        {'sources/': [
+          ['include', '_(win)\\.cc$'],
+          ['include', '/win/'],
+          ['include', '/win_[^/]*\\.cc$'],
+        ]},
+        {'variables': {'toolkit_views2': 1}},
+      ],
+      ['toolkit_views2==0', {'sources/': [
+        ['exclude', 'views/'],
       ]}],
       ['touchui==0', {'sources/': [
         ['exclude', 'event_x.cc$'],
@@ -41,7 +48,16 @@
     ],
   },
   'includes': [
-    'base/ui_base.gypi',
+    'ui_base.gypi',
+    'ui_gfx.gypi',
+    'ui_unittests.gypi',
+  ],
+  'conditions': [
+    ['toolkit_views2==1', {
+      'includes': [
+        'ui_views.gypi',
+      ],
+    }],
   ],
 }
 
diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi
new file mode 100644
index 0000000..bd45e3a
--- /dev/null
+++ b/ui/ui_base.gypi
@@ -0,0 +1,73 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'ui_base',
+      'type': '<(library)',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../skia/skia.gyp:skia',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        'ui_gfx',
+      ],
+      # Export these dependencies since text_elider.h includes ICU headers.
+      'export_dependent_settings': [
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+      ],
+      'sources': [
+        'base/accessibility/accessibility_types.h',
+        'base/accessibility/accessible_view_state.h',
+        'base/accessibility/accessible_view_state.cc',
+        'base/animation/animation.cc',
+        'base/animation/animation.h',
+        'base/animation/animation_container.cc',
+        'base/animation/animation_container.h',
+        'base/animation/animation_container_element.h',
+        'base/animation/animation_container_observer.h',
+        'base/animation/animation_delegate.h',
+        'base/animation/linear_animation.cc',
+        'base/animation/linear_animation.h',
+        'base/animation/multi_animation.cc',
+        'base/animation/multi_animation.h',
+        'base/animation/slide_animation.cc',
+        'base/animation/slide_animation.h',
+        'base/animation/throb_animation.cc',
+        'base/animation/throb_animation.h',
+        'base/animation/tween.cc',
+        'base/animation/tween.h',
+        'base/clipboard/clipboard.cc',
+        'base/clipboard/clipboard.h',
+        'base/clipboard/clipboard_linux.cc',
+        'base/clipboard/clipboard_mac.mm',
+        'base/clipboard/clipboard_util_win.cc',
+        'base/clipboard/clipboard_util_win.h',
+        'base/clipboard/clipboard_win.cc',
+        'base/clipboard/scoped_clipboard_writer.cc',
+        'base/clipboard/scoped_clipboard_writer.h',
+        'base/range/range.cc',
+        'base/range/range.h',
+        'base/range/range.mm',
+      ],
+      'conditions': [
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xext',
+          ],
+        }],
+      ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi
new file mode 100644
index 0000000..9d27543
--- /dev/null
+++ b/ui/ui_gfx.gypi
@@ -0,0 +1,216 @@
+# 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',
+          '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; ' \
+            'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
+            'os.chmod(\'<(ui_copy_dest)\', 0700)'
+          ]
+        }
+      ],
+    },
+    {
+      '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:
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
new file mode 100644
index 0000000..faeaf66
--- /dev/null
+++ b/ui/ui_unittests.gypi
@@ -0,0 +1,113 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'ui_unittests',
+      'type': 'executable',
+      'msvs_guid': 'C412B00F-2098-4833-B3DE-A1B8B7A094F0',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:test_support_base',
+        '../skia/skia.gyp:skia',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
+        'ui_base',
+        'ui_gfx',
+        'gfx_resources',
+      ],
+      'sources': [
+        'base/animation/animation_container_unittest.cc',
+        'base/animation/animation_unittest.cc',
+        'base/animation/multi_animation_unittest.cc',
+        'base/animation/slide_animation_unittest.cc',
+        'base/clipboard/clipboard_unittest.cc',
+        'base/range/range_unittest.cc',
+        'base/range/range_unittest.mm',
+        'gfx/blit_unittest.cc',
+        'gfx/codec/jpeg_codec_unittest.cc',
+        'gfx/codec/png_codec_unittest.cc',
+        'gfx/color_utils_unittest.cc',
+        'gfx/font_unittest.cc',
+        'gfx/image_unittest.cc',
+        'gfx/image_unittest.h',
+        'gfx/insets_unittest.cc',
+        'gfx/rect_unittest.cc',
+        'gfx/run_all_unittests.cc',
+        'gfx/skbitmap_operations_unittest.cc',
+        'gfx/test_suite.cc',
+        'gfx/test_suite.h',
+        'views/rendering/border_unittest.cc',
+        'views/view_unittest.cc',
+        'views/widget/native_widget_win_unittest.cc',
+        'views/widget/root_view_unittest.cc',
+        'views/widget/widget_test_util.cc',
+        'views/widget/widget_test_util.h',
+        'views/widget/widget_unittest.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
+      ],
+      'include_dirs': [
+        '../',
+      ],
+      'conditions': [
+        ['toolkit_views2==1', {
+          'dependencies': [
+            'v2',
+          ],
+        }],
+        ['OS=="win"', {
+          'sources': [
+            # TODO(brettw) re-enable this when the dependencies on WindowImpl are fixed!
+            'gfx/canvas_direct2d_unittest.cc',
+            'gfx/icon_util_unittest.cc',
+            'gfx/native_theme_win_unittest.cc',
+          ],
+          'include_dirs': [
+            '../..',
+            '../third_party/wtl/include',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'DelayLoadDLLs': [
+                'd2d1.dll',
+                'd3d10_1.dll',
+              ],
+              'AdditionalDependencies': [
+                'd2d1.lib',
+                'd3d10_1.lib',
+              ],
+            },
+            'link_settings': {
+              'libraries': [
+                '-limm32.lib',
+                '-loleacc.lib',
+              ],
+            },
+          },
+        }],
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'dependencies': [
+            '../app/app.gyp:app_base',
+            '../build/linux/system.gyp:gtk',
+            '../chrome/chrome.gyp:packed_resources',
+          ],
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+               'dependencies': [
+                 '../base/allocator/allocator.gyp:allocator',
+               ],
+            }],
+          ],
+        }],
+      ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/ui/ui_views.gypi b/ui/ui_views.gypi
new file mode 100644
index 0000000..e7e54f7
--- /dev/null
+++ b/ui/ui_views.gypi
@@ -0,0 +1,108 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'v2',
+      'type': '<(library)',
+      'msvs_guid': '70760ECA-4D8B-47A4-ACDC-D3E7F25F0543',
+      'dependencies': [
+        '../skia/skia.gyp:skia',
+        '../ui/base/strings/ui_strings.gyp:ui_strings',
+        'ui_gfx',
+      ],
+      'sources': [
+        'views/events/accelerator.cc',
+        'views/events/accelerator.h',
+        'views/events/context_menu_controller.h',
+        'views/events/drag_controller.h',
+        'views/events/event.cc',
+        'views/events/event.h',
+        'views/events/event_win.cc',
+        'views/events/focus_event.cc',
+        'views/events/focus_event.h',
+        'views/focus/accelerator_handler.h',
+        'views/focus/accelerator_handler_win.cc',
+        'views/focus/focus_manager.cc',
+        'views/focus/focus_manager.h',
+        'views/focus/focus_search.cc',
+        'views/focus/focus_search.h',
+        'views/layout/fill_layout.cc',
+        'views/layout/fill_layout.h',
+        'views/layout/layout_manager.cc',
+        'views/layout/layout_manager.h',
+        'views/native_types.h',
+        'views/rendering/border.cc',
+        'views/rendering/border.h',
+        'views/view.cc',
+        'views/view.h',
+        'views/widget/native_widget.h',
+        'views/widget/native_widget_listener.h',
+        'views/widget/native_widget_views.cc',
+        'views/widget/native_widget_views.h',
+        'views/widget/native_widget_win.cc',
+        'views/widget/native_widget_win.h',
+        'views/widget/root_view.cc',
+        'views/widget/root_view.h',
+        'views/widget/widget.cc',
+        'views/widget/widget.h',
+        'views/window/window.cc',
+        'views/window/window.h',
+        'views/window/native_window.h',
+        'views/window/native_window_views.cc',
+        'views/window/native_window_views.h',
+        'views/window/native_window_win.cc',
+        'views/window/native_window_win.h',
+      ],
+      'include_dirs': [
+        '../',
+      ],
+      'conditions': [
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xext',
+          ],
+          'sources!': [
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            '../third_party/wtl/include',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'views_demo',
+      'type': 'executable',
+      'dependencies': [
+        '../skia/skia.gyp:skia',
+        'v2',
+      ],
+      'sources': [
+        'views/demo/main.cc',
+      ],
+      'include_dirs': [
+        '../',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'sources': [
+            'views/widget/widget.rc',
+            'views/widget/widget_resource.h',
+          ],
+        }],
+      ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
deleted file mode 100644
index 527e9c2..0000000
--- a/ui/views/views.gyp
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright (c) 2010 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': {
-    'chromium_code': 1,
-  },
-  'target_defaults': {
-    'sources/': [
-      ['exclude', '/(cocoa|gtk|win)/'],
-      ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)\\.(cc|mm?)$'],
-      ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
-    ],
-    'conditions': [
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-        ['include', '/gtk/'],
-        ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
-        ['include', '/(gtk|x11)_[^/]*\\.cc$'],
-      ]}],
-      ['OS=="mac"', {'sources/': [
-        ['include', '/cocoa/'],
-        ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],
-      ]}, { # else: OS != "mac"
-        'sources/': [
-          ['exclude', '\\.mm?$'],
-        ],
-      }],
-      ['OS=="win"', {'sources/': [
-        ['include', '_(win)\\.cc$'],
-        ['include', '/win/'],
-        ['include', '/win_[^/]*\\.cc$'],
-      ]}],
-      ['touchui==0', {'sources/': [
-        ['exclude', 'event_x.cc$'],
-        ['exclude', 'native_menu_x.cc$'],
-        ['exclude', 'native_menu_x.h$'],
-        ['exclude', 'touchui/'],
-        ['exclude', '_(touch)\\.cc$'],
-      ]}],
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'v2',
-      'type': '<(library)',
-      'msvs_guid': '70760ECA-4D8B-47A4-ACDC-D3E7F25F0543',
-      'dependencies': [
-        '<(DEPTH)/app/app.gyp:app_base',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-      ],
-      'sources': [
-        'events/accelerator.cc',
-        'events/accelerator.h',
-        'events/context_menu_controller.h',
-        'events/drag_controller.h',
-        'events/event.cc',
-        'events/event.h',
-        'events/event_win.cc',
-        'events/focus_event.cc',
-        'events/focus_event.h',
-        'focus/accelerator_handler.h',
-        'focus/accelerator_handler_win.cc',
-        'focus/focus_manager.cc',
-        'focus/focus_manager.h',
-        'focus/focus_search.cc',
-        'focus/focus_search.h',
-        'layout/fill_layout.cc',
-        'layout/fill_layout.h',
-        'layout/layout_manager.cc',
-        'layout/layout_manager.h',
-        'native_types.h',
-        'rendering/border.cc',
-        'rendering/border.h',
-        'view.cc',
-        'view.h',
-        'widget/native_widget.h',
-        'widget/native_widget_listener.h',
-        'widget/native_widget_views.cc',
-        'widget/native_widget_views.h',
-        'widget/native_widget_win.cc',
-        'widget/native_widget_win.h',
-        'widget/root_view.cc',
-        'widget/root_view.h',
-        'widget/widget.cc',
-        'widget/widget.h',
-        'window/window.cc',
-        'window/window.h',
-        'window/native_window.h',
-        'window/native_window_views.cc',
-        'window/native_window_views.h',
-        'window/native_window_win.cc',
-        'window/native_window_win.h',
-      ],
-      'include_dirs': [
-        '<(DEPTH)',
-      ],
-      'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-            '<(DEPTH)/build/linux/system.gyp:x11',
-            '<(DEPTH)/build/linux/system.gyp:xext',
-          ],
-          'sources!': [
-          ],
-        }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'views_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:test_support_base',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-        'v2',
-      ],
-      'sources': [
-        'rendering/border_unittest.cc',
-        'run_all_unittests.cc',
-        'view_unittest.cc',
-        'widget/native_widget_win_unittest.cc',
-        'widget/root_view_unittest.cc',
-        'widget/widget_test_util.cc',
-        'widget/widget_test_util.h',
-        'widget/widget_unittest.cc',
-      ],
-      'include_dirs': [
-        '<(DEPTH)',
-      ],
-      'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-            '<(DEPTH)/chrome/chrome.gyp:packed_resources',
-          ],
-          'conditions': [
-            ['linux_use_tcmalloc==1', {
-               'dependencies': [
-                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-               ],
-            }],
-          ],
-        },
-        ],
-        ['OS=="win"', {
-          'sources': [
-            'widget/widget.rc',
-            'widget/widget_resource.h',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-limm32.lib',
-              '-loleacc.lib',
-            ]
-          },
-        }],
-      ],
-    },
-    {
-      'target_name': 'views_demo',
-      'type': 'executable',
-      'dependencies': [
-        '<(DEPTH)/skia/skia.gyp:skia',
-        'v2',
-      ],
-      'sources': [
-        'demo/main.cc',
-      ],
-      'include_dirs': [
-        '<(DEPTH)',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'sources': [
-            'widget/widget.rc',
-            'widget/widget_resource.h',
-          ],
-        }],
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index b62b4bb..f457de8 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -11,7 +11,7 @@
       'target_name': 'webkit_support',
       'type': '<(library)',
       'dependencies': [
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
+        '<(DEPTH)/ui/ui.gyp:ui_gfx',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 67c2cbb..377d3d4 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -323,7 +323,7 @@
           ],
         }, { # OS != "mac"
           'dependencies': [
-            '<(DEPTH)/ui/gfx/gfx.gyp:gfx_resources',
+            '<(DEPTH)/ui/ui.gyp:gfx_resources',
             '<(DEPTH)/net/net.gyp:net_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',