Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: ash/ash.gyp

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix formatting Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/display/display_change_observer_chromeos.h » ('j') | ui/display/OWNERS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 ['exclude', 'display/display_change_observer_chromeos.h'], 672 ['exclude', 'display/display_change_observer_chromeos.h'],
673 ['exclude', 'display/display_error_observer_chromeos.cc'], 673 ['exclude', 'display/display_error_observer_chromeos.cc'],
674 ['exclude', 'display/display_error_observer_chromeos.h'], 674 ['exclude', 'display/display_error_observer_chromeos.h'],
675 ], 675 ],
676 }], 676 }],
677 ['chromeos==1', { 677 ['chromeos==1', {
678 'dependencies': [ 678 'dependencies': [
679 '../chromeos/chromeos.gyp:chromeos', 679 '../chromeos/chromeos.gyp:chromeos',
680 # Ash #includes power_supply_properties.pb.h directly. 680 # Ash #includes power_supply_properties.pb.h directly.
681 '../chromeos/chromeos.gyp:power_manager_proto', 681 '../chromeos/chromeos.gyp:power_manager_proto',
682 » '../device/bluetooth/bluetooth.gyp:device_bluetooth', 682 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
683 '../ui/display/display.gyp:display',
683 ], 684 ],
684 }, { # else: chromeos!=1 685 }, { # else: chromeos!=1
685 'sources/': [ 686 'sources/': [
686 ['exclude', 'display/output_configurator_animation.cc'], 687 ['exclude', 'display/output_configurator_animation.cc'],
687 ['exclude', 'display/output_configurator_animation.h'], 688 ['exclude', 'display/output_configurator_animation.h'],
688 ['exclude', 'display/resolution_notification_controller.cc'], 689 ['exclude', 'display/resolution_notification_controller.cc'],
689 ['exclude', 'display/resolution_notification_controller.h'], 690 ['exclude', 'display/resolution_notification_controller.h'],
690 ], 691 ],
691 }], 692 }],
692 ], 693 ],
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 '../content/content_shell_and_tests.gyp:test_support_content', 822 '../content/content_shell_and_tests.gyp:test_support_content',
822 '../skia/skia.gyp:skia', 823 '../skia/skia.gyp:skia',
823 '../testing/gtest.gyp:gtest', 824 '../testing/gtest.gyp:gtest',
824 '../third_party/icu/icu.gyp:icui18n', 825 '../third_party/icu/icu.gyp:icui18n',
825 '../third_party/icu/icu.gyp:icuuc', 826 '../third_party/icu/icu.gyp:icuuc',
826 '../ui/app_list/app_list.gyp:app_list', 827 '../ui/app_list/app_list.gyp:app_list',
827 '../ui/aura/aura.gyp:aura', 828 '../ui/aura/aura.gyp:aura',
828 '../ui/aura/aura.gyp:aura_test_support', 829 '../ui/aura/aura.gyp:aura_test_support',
829 '../ui/compositor/compositor.gyp:compositor', 830 '../ui/compositor/compositor.gyp:compositor',
830 '../ui/compositor/compositor.gyp:compositor_test_support', 831 '../ui/compositor/compositor.gyp:compositor_test_support',
832 '../ui/display/display.gyp:display',
831 '../ui/events/events.gyp:events', 833 '../ui/events/events.gyp:events',
832 '../ui/events/events.gyp:events_test_support', 834 '../ui/events/events.gyp:events_test_support',
833 '../ui/gfx/gfx.gyp:gfx', 835 '../ui/gfx/gfx.gyp:gfx',
834 '../ui/gfx/gfx.gyp:gfx_geometry', 836 '../ui/gfx/gfx.gyp:gfx_geometry',
835 '../ui/keyboard/keyboard.gyp:keyboard', 837 '../ui/keyboard/keyboard.gyp:keyboard',
836 '../ui/message_center/message_center.gyp:message_center', 838 '../ui/message_center/message_center.gyp:message_center',
837 '../ui/message_center/message_center.gyp:message_center_test_support', 839 '../ui/message_center/message_center.gyp:message_center_test_support',
838 '../ui/resources/ui_resources.gyp:ui_resources', 840 '../ui/resources/ui_resources.gyp:ui_resources',
839 '../ui/ui.gyp:ui', 841 '../ui/ui.gyp:ui',
840 '../ui/ui_unittests.gyp:ui_test_support', 842 '../ui/ui_unittests.gyp:ui_test_support',
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 }], 1129 }],
1128 ['chromeos==1', { 1130 ['chromeos==1', {
1129 'dependencies': [ 1131 'dependencies': [
1130 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1132 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1131 ], 1133 ],
1132 }], 1134 }],
1133 ], 1135 ],
1134 }, 1136 },
1135 ], 1137 ],
1136 } 1138 }
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_change_observer_chromeos.h » ('j') | ui/display/OWNERS » ('J')

Powered by Google App Engine
This is Rietveld 408576698