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

Side by Side Diff: ash/ash.gyp

Issue 351353004: chromeos: Move some network related UI in ui/chromeos/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-build 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 | 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': [
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 'system/chromeos/enterprise/tray_enterprise.h', 324 'system/chromeos/enterprise/tray_enterprise.h',
325 'system/chromeos/keyboard_brightness_controller.cc', 325 'system/chromeos/keyboard_brightness_controller.cc',
326 'system/chromeos/keyboard_brightness_controller.h', 326 'system/chromeos/keyboard_brightness_controller.h',
327 'system/chromeos/label_tray_view.cc', 327 'system/chromeos/label_tray_view.cc',
328 'system/chromeos/label_tray_view.h', 328 'system/chromeos/label_tray_view.h',
329 'system/chromeos/managed/tray_locally_managed_user.cc', 329 'system/chromeos/managed/tray_locally_managed_user.cc',
330 'system/chromeos/managed/tray_locally_managed_user.h', 330 'system/chromeos/managed/tray_locally_managed_user.h',
331 'system/chromeos/network/network_connect.cc', 331 'system/chromeos/network/network_connect.cc',
332 'system/chromeos/network/network_connect.h', 332 'system/chromeos/network/network_connect.h',
333 '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',
339 'system/chromeos/network/network_observer.h', 334 'system/chromeos/network/network_observer.h',
340 'system/chromeos/network/network_portal_detector_observer.h', 335 'system/chromeos/network/network_portal_detector_observer.h',
341 'system/chromeos/network/network_state_list_detailed_view.cc', 336 'system/chromeos/network/network_state_list_detailed_view.cc',
342 'system/chromeos/network/network_state_list_detailed_view.h', 337 'system/chromeos/network/network_state_list_detailed_view.h',
343 'system/chromeos/network/network_state_notifier.cc', 338 'system/chromeos/network/network_state_notifier.cc',
344 'system/chromeos/network/network_state_notifier.h', 339 'system/chromeos/network/network_state_notifier.h',
345 'system/chromeos/network/tray_network.cc', 340 'system/chromeos/network/tray_network.cc',
346 'system/chromeos/network/tray_network.h', 341 'system/chromeos/network/tray_network.h',
347 'system/chromeos/network/tray_network_state_observer.cc', 342 'system/chromeos/network/tray_network_state_observer.cc',
348 'system/chromeos/network/tray_network_state_observer.h', 343 'system/chromeos/network/tray_network_state_observer.h',
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 'dependencies': [ 714 'dependencies': [
720 '../build/linux/system.gyp:xfixes', 715 '../build/linux/system.gyp:xfixes',
721 ], 716 ],
722 }], 717 }],
723 ['chromeos==1', { 718 ['chromeos==1', {
724 'dependencies': [ 719 'dependencies': [
725 '../chromeos/chromeos.gyp:chromeos', 720 '../chromeos/chromeos.gyp:chromeos',
726 # Ash #includes power_supply_properties.pb.h directly. 721 # Ash #includes power_supply_properties.pb.h directly.
727 '../chromeos/chromeos.gyp:power_manager_proto', 722 '../chromeos/chromeos.gyp:power_manager_proto',
728 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 723 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
724 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
725 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
729 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 726 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
730 '../ui/display/display.gyp:display', 727 '../ui/display/display.gyp:display',
731 '../ui/display/display.gyp:display_util', 728 '../ui/display/display.gyp:display_util',
732 ], 729 ],
733 }, { # else: chromeos!=1 730 }, { # else: chromeos!=1
734 'sources/': [ 731 'sources/': [
735 ['exclude', 'display/display_configurator_animation.cc'], 732 ['exclude', 'display/display_configurator_animation.cc'],
736 ['exclude', 'display/display_configurator_animation.h'], 733 ['exclude', 'display/display_configurator_animation.h'],
737 ['exclude', 'display/resolution_notification_controller.cc'], 734 ['exclude', 'display/resolution_notification_controller.cc'],
738 ['exclude', 'display/resolution_notification_controller.h'], 735 ['exclude', 'display/resolution_notification_controller.h'],
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 'conditions': [ 1219 'conditions': [
1223 ['chromeos==1', { 1220 ['chromeos==1', {
1224 'dependencies': [ 1221 'dependencies': [
1225 '../ui/display/display.gyp:display', 1222 '../ui/display/display.gyp:display',
1226 ], 1223 ],
1227 }], 1224 }],
1228 ], 1225 ],
1229 }, 1226 },
1230 ], 1227 ],
1231 } 1228 }
OLDNEW
« no previous file with comments | « no previous file | ash/ash_chromeos_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698