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

Side by Side Diff: ash/ash.gyp

Issue 9837075: Move power_supply_status.* from src/ash to src/chromeos (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 8 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
« no previous file with comments | « no previous file | ash/system/power/power_status_observer.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 10
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 ['exclude', 'accelerators/accelerator_controller.cc'], 292 ['exclude', 'accelerators/accelerator_controller.cc'],
293 ['exclude', 'accelerators/accelerator_controller.h'], 293 ['exclude', 'accelerators/accelerator_controller.h'],
294 ['exclude', 'accelerators/accelerator_dispatcher.cc'], 294 ['exclude', 'accelerators/accelerator_dispatcher.cc'],
295 ['exclude', 'accelerators/accelerator_dispatcher.h'], 295 ['exclude', 'accelerators/accelerator_dispatcher.h'],
296 ['exclude', 'accelerators/accelerator_filter.cc'], 296 ['exclude', 'accelerators/accelerator_filter.cc'],
297 ['exclude', 'accelerators/accelerator_filter.h'], 297 ['exclude', 'accelerators/accelerator_filter.h'],
298 ['exclude', 'accelerators/nested_dispatcher_controller.cc'], 298 ['exclude', 'accelerators/nested_dispatcher_controller.cc'],
299 ['exclude', 'accelerators/nested_dispatcher_controller.h'], 299 ['exclude', 'accelerators/nested_dispatcher_controller.h'],
300 ], 300 ],
301 }], 301 }],
302 ['chromeos==1', {
303 'dependencies': [
304 '../chromeos/chromeos.gyp:chromeos',
305 ],
306 }],
302 ], 307 ],
303 }, 308 },
304 { 309 {
305 'target_name': 'aura_shell_unittests', 310 'target_name': 'aura_shell_unittests',
306 'type': 'executable', 311 'type': 'executable',
307 'dependencies': [ 312 'dependencies': [
308 '../base/base.gyp:base', 313 '../base/base.gyp:base',
309 '../base/base.gyp:test_support_base', 314 '../base/base.gyp:test_support_base',
310 '../chrome/chrome_resources.gyp:packed_resources', 315 '../chrome/chrome_resources.gyp:packed_resources',
311 '../build/temp_gyp/googleurl.gyp:googleurl', 316 '../build/temp_gyp/googleurl.gyp:googleurl',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 'shell/cocoa/app-Info.plist', 482 'shell/cocoa/app-Info.plist',
478 ], 483 ],
479 'xcode_settings': { 484 'xcode_settings': {
480 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 485 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
481 }, 486 },
482 }], 487 }],
483 ], 488 ],
484 }, 489 },
485 ], 490 ],
486 } 491 }
OLDNEW
« no previous file with comments | « no previous file | ash/system/power/power_status_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698