Normalize the top-level ui/ module.

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index e289b0b4346777d8f23cb0ad65f011367deab52c..d2e700d37ec320569234c3bba7ee67b7e8358df3 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',
+      ],
+    }],
   ],
 }