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

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: Fix dependency position Created 8 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
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | ash/system/power/power_status_observer.h » ('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 10
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'ash', 13 'target_name': 'ash',
14 'type': '<(component)', 14 'type': '<(component)',
15 'dependencies': [ 15 'dependencies': [
16 'ash_strings.gyp:ash_strings', 16 'ash_strings.gyp:ash_strings',
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../base/base.gyp:base_i18n', 18 '../base/base.gyp:base_i18n',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
20 '../build/temp_gyp/googleurl.gyp:googleurl', 20 '../build/temp_gyp/googleurl.gyp:googleurl',
21 '../chromeos/chromeos.gyp:chromeos_libs',
21 '../net/net.gyp:net', 22 '../net/net.gyp:net',
22 '../skia/skia.gyp:skia', 23 '../skia/skia.gyp:skia',
23 '../third_party/icu/icu.gyp:icui18n', 24 '../third_party/icu/icu.gyp:icui18n',
24 '../third_party/icu/icu.gyp:icuuc', 25 '../third_party/icu/icu.gyp:icuuc',
25 '../ui/aura/aura.gyp:aura', 26 '../ui/aura/aura.gyp:aura',
26 '../ui/base/strings/ui_strings.gyp:ui_strings', 27 '../ui/base/strings/ui_strings.gyp:ui_strings',
27 '../ui/gfx/compositor/compositor.gyp:compositor', 28 '../ui/gfx/compositor/compositor.gyp:compositor',
28 '../ui/oak/oak.gyp:oak', 29 '../ui/oak/oak.gyp:oak',
29 '../ui/ui.gyp:ui', 30 '../ui/ui.gyp:ui',
30 '../ui/ui.gyp:ui_resources', 31 '../ui/ui.gyp:ui_resources',
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 'system/date/date_view.h', 137 'system/date/date_view.h',
137 'system/date/tray_date.cc', 138 'system/date/tray_date.cc',
138 'system/date/tray_date.h', 139 'system/date/tray_date.h',
139 'system/ime/ime_observer.h', 140 'system/ime/ime_observer.h',
140 'system/ime/tray_ime.cc', 141 'system/ime/tray_ime.cc',
141 'system/ime/tray_ime.h', 142 'system/ime/tray_ime.h',
142 'system/network/network_observer.h', 143 'system/network/network_observer.h',
143 'system/network/tray_network.cc', 144 'system/network/tray_network.cc',
144 'system/network/tray_network.h', 145 'system/network/tray_network.h',
145 'system/power/power_status_observer.h', 146 'system/power/power_status_observer.h',
146 'system/power/power_supply_status.cc',
147 'system/power/power_supply_status.h',
148 'system/power/tray_power.cc', 147 'system/power/tray_power.cc',
149 'system/power/tray_power.h', 148 'system/power/tray_power.h',
150 'system/settings/tray_settings.cc', 149 'system/settings/tray_settings.cc',
151 'system/settings/tray_settings.h', 150 'system/settings/tray_settings.h',
152 'system/tray/system_tray.cc', 151 'system/tray/system_tray.cc',
153 'system/tray/system_tray.h', 152 'system/tray/system_tray.h',
154 'system/tray/system_tray_delegate.h', 153 'system/tray/system_tray_delegate.h',
155 'system/tray/system_tray_item.cc', 154 'system/tray/system_tray_item.cc',
156 'system/tray/system_tray_item.h', 155 'system/tray/system_tray_item.h',
157 'system/tray/tray_constants.cc', 156 'system/tray/tray_constants.cc',
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 'shell/cocoa/app-Info.plist', 469 'shell/cocoa/app-Info.plist',
471 ], 470 ],
472 'xcode_settings': { 471 'xcode_settings': {
473 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 472 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
474 }, 473 },
475 }], 474 }],
476 ], 475 ],
477 }, 476 },
478 ], 477 ],
479 } 478 }
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | ash/system/power/power_status_observer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698