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

Side by Side Diff: ash/ash.gyp

Issue 187073002: Refactoring display configuration state to allow generic state objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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') | no next file with comments »
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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1025 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1026 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'], 1026 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'],
1027 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'], 1027 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'],
1028 ], 1028 ],
1029 }], 1029 }],
1030 ['chromeos==1', { 1030 ['chromeos==1', {
1031 'dependencies': [ 1031 'dependencies': [
1032 '../chromeos/chromeos.gyp:power_manager_proto', 1032 '../chromeos/chromeos.gyp:power_manager_proto',
1033 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1033 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1034 '../ui/display/display.gyp:display', 1034 '../ui/display/display.gyp:display',
1035 '../ui/display/display.gyp:display_test_util',
1035 ], 1036 ],
1036 'sources': [ 1037 'sources': [
1037 'first_run/first_run_helper_unittest.cc', 1038 'first_run/first_run_helper_unittest.cc',
1038 ], 1039 ],
1039 }, { # else: chromeos!=1 1040 }, { # else: chromeos!=1
1040 'sources/': [ 1041 'sources/': [
1041 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1042 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1042 ], 1043 ],
1043 }], 1044 }],
1044 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1045 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 }], 1135 }],
1135 ['chromeos==1', { 1136 ['chromeos==1', {
1136 'dependencies': [ 1137 'dependencies': [
1137 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1138 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1138 ], 1139 ],
1139 }], 1140 }],
1140 ], 1141 ],
1141 }, 1142 },
1142 ], 1143 ],
1143 } 1144 }
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_change_observer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698