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

Side by Side Diff: trunk/src/ash/ash.gyp

Issue 383373002: Revert 282837 because it broke non-chromeos builds. (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | trunk/src/ash/ash_chromeos_strings.grdp » ('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 'targets': [ 10 'targets': [
11 { 11 {
12 'target_name': 'ash', 12 'target_name': 'ash',
13 'type': '<(component)', 13 'type': '<(component)',
14 'dependencies': [ 14 'dependencies': [
15 '../base/base.gyp:base', 15 '../base/base.gyp:base',
16 '../base/base.gyp:base_i18n', 16 '../base/base.gyp:base_i18n',
17 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 17 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
18 '../cc/cc.gyp:cc', 18 '../cc/cc.gyp:cc',
19 '../content/content.gyp:content_browser', 19 '../content/content.gyp:content_browser',
20 '../media/media.gyp:media', 20 '../media/media.gyp:media',
21 '../net/net.gyp:net', 21 '../net/net.gyp:net',
22 '../skia/skia.gyp:skia', 22 '../skia/skia.gyp:skia',
23 '../third_party/icu/icu.gyp:icui18n', 23 '../third_party/icu/icu.gyp:icui18n',
24 '../third_party/icu/icu.gyp:icuuc', 24 '../third_party/icu/icu.gyp:icuuc',
25 '../ui/accessibility/accessibility.gyp:accessibility', 25 '../ui/accessibility/accessibility.gyp:accessibility',
26 '../ui/app_list/app_list.gyp:app_list', 26 '../ui/app_list/app_list.gyp:app_list',
27 '../ui/aura/aura.gyp:aura', 27 '../ui/aura/aura.gyp:aura',
28 '../ui/base/ui_base.gyp:ui_base', 28 '../ui/base/ui_base.gyp:ui_base',
29 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
30 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
31 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
32 '../ui/compositor/compositor.gyp:compositor', 29 '../ui/compositor/compositor.gyp:compositor',
33 '../ui/events/events.gyp:events', 30 '../ui/events/events.gyp:events',
34 '../ui/events/events.gyp:events_base', 31 '../ui/events/events.gyp:events_base',
35 '../ui/gfx/gfx.gyp:gfx', 32 '../ui/gfx/gfx.gyp:gfx',
36 '../ui/gfx/gfx.gyp:gfx_geometry', 33 '../ui/gfx/gfx.gyp:gfx_geometry',
37 '../ui/keyboard/keyboard.gyp:keyboard', 34 '../ui/keyboard/keyboard.gyp:keyboard',
38 '../ui/message_center/message_center.gyp:message_center', 35 '../ui/message_center/message_center.gyp:message_center',
39 '../ui/resources/ui_resources.gyp:ui_resources', 36 '../ui/resources/ui_resources.gyp:ui_resources',
40 '../ui/strings/ui_strings.gyp:ui_strings', 37 '../ui/strings/ui_strings.gyp:ui_strings',
41 '../ui/views/controls/webview/webview.gyp:webview', 38 '../ui/views/controls/webview/webview.gyp:webview',
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 'system/chromeos/enterprise/tray_enterprise.h', 324 'system/chromeos/enterprise/tray_enterprise.h',
328 'system/chromeos/keyboard_brightness_controller.cc', 325 'system/chromeos/keyboard_brightness_controller.cc',
329 'system/chromeos/keyboard_brightness_controller.h', 326 'system/chromeos/keyboard_brightness_controller.h',
330 'system/chromeos/label_tray_view.cc', 327 'system/chromeos/label_tray_view.cc',
331 'system/chromeos/label_tray_view.h', 328 'system/chromeos/label_tray_view.h',
332 'system/chromeos/managed/tray_locally_managed_user.cc', 329 'system/chromeos/managed/tray_locally_managed_user.cc',
333 'system/chromeos/managed/tray_locally_managed_user.h', 330 'system/chromeos/managed/tray_locally_managed_user.h',
334 'system/chromeos/network/network_connect.cc', 331 'system/chromeos/network/network_connect.cc',
335 'system/chromeos/network/network_connect.h', 332 'system/chromeos/network/network_connect.h',
336 'system/chromeos/network/network_detailed_view.h', 333 'system/chromeos/network/network_detailed_view.h',
334 'system/chromeos/network/network_icon.cc',
335 'system/chromeos/network/network_icon.h',
336 'system/chromeos/network/network_icon_animation.cc',
337 'system/chromeos/network/network_icon_animation.h',
338 'system/chromeos/network/network_icon_animation_observer.h',
337 'system/chromeos/network/network_observer.h', 339 'system/chromeos/network/network_observer.h',
338 'system/chromeos/network/network_portal_detector_observer.h', 340 'system/chromeos/network/network_portal_detector_observer.h',
339 'system/chromeos/network/network_state_list_detailed_view.cc', 341 'system/chromeos/network/network_state_list_detailed_view.cc',
340 'system/chromeos/network/network_state_list_detailed_view.h', 342 'system/chromeos/network/network_state_list_detailed_view.h',
341 'system/chromeos/network/network_state_notifier.cc', 343 'system/chromeos/network/network_state_notifier.cc',
342 'system/chromeos/network/network_state_notifier.h', 344 'system/chromeos/network/network_state_notifier.h',
343 'system/chromeos/network/tray_network.cc', 345 'system/chromeos/network/tray_network.cc',
344 'system/chromeos/network/tray_network.h', 346 'system/chromeos/network/tray_network.h',
345 'system/chromeos/network/tray_network_state_observer.cc', 347 'system/chromeos/network/tray_network_state_observer.cc',
346 'system/chromeos/network/tray_network_state_observer.h', 348 'system/chromeos/network/tray_network_state_observer.h',
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 'conditions': [ 1222 'conditions': [
1221 ['chromeos==1', { 1223 ['chromeos==1', {
1222 'dependencies': [ 1224 'dependencies': [
1223 '../ui/display/display.gyp:display', 1225 '../ui/display/display.gyp:display',
1224 ], 1226 ],
1225 }], 1227 }],
1226 ], 1228 ],
1227 }, 1229 },
1228 ], 1230 ],
1229 } 1231 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/ash/ash_chromeos_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698