ui: Move compositor/ directory out of gfx/, up to ui/.

ash/ash.gyp

 # Copyright (c) 2012 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_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
 
   'targets': [
     {
       'target_name': 'ash',
       'type': '<(component)',
       'dependencies': [
         'ash_strings.gyp:ash_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/aura/aura.gyp:aura',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
-        '../ui/gfx/compositor/compositor.gyp:compositor',
+        '../ui/compositor/compositor.gyp:compositor',
         '../ui/oak/oak.gyp:oak',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/views/views.gyp:views',
       ],
       'defines': [
         'ASH_IMPLEMENTATION',
       ],
       'sources': [
@@ skipping 285 matching lines @@
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:test_support_aura',
-        '../ui/gfx/compositor/compositor.gyp:compositor',
-        '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
+        '../ui/compositor/compositor.gyp:compositor',
+        '../ui/compositor/compositor.gyp:compositor_test_support',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/views/views.gyp:views',
         'ash',
       ],
       'sources': [
         '../ui/views/test/test_views_delegate.cc',
         '../ui/views/test/test_views_delegate.h',
@@ skipping 97 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_shell_lib',
         '../content/content.gyp:content',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/aura/aura.gyp:aura',
-        '../ui/gfx/compositor/compositor.gyp:compositor',
-        '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
+        '../ui/compositor/compositor.gyp:compositor',
+        '../ui/compositor/compositor.gyp:compositor_test_support',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/views/views.gyp:views',
         '../ui/views/views.gyp:views_examples_lib',
         'ash',
       ],
       'sources': [
         'shell/app_list.cc',
@@ skipping 58 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }