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

Side by Side Diff: chromeos/chromeos.gyp

Issue 139053003: Chrome OS: avoid suspending on lid close when casting is active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments and add unit test. Created 6 years, 11 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
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 }, 8 },
9 'includes': [ 9 'includes': [
10 'chromeos_memory.gypi', 10 'chromeos_memory.gypi',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 'network/favorite_state.cc', 242 'network/favorite_state.cc',
243 'network/favorite_state.h', 243 'network/favorite_state.h',
244 'network/geolocation_handler.cc', 244 'network/geolocation_handler.cc',
245 'network/geolocation_handler.h', 245 'network/geolocation_handler.h',
246 'network/managed_network_configuration_handler.cc', 246 'network/managed_network_configuration_handler.cc',
247 'network/managed_network_configuration_handler.h', 247 'network/managed_network_configuration_handler.h',
248 'network/managed_network_configuration_handler_impl.cc', 248 'network/managed_network_configuration_handler_impl.cc',
249 'network/managed_network_configuration_handler_impl.h', 249 'network/managed_network_configuration_handler_impl.h',
250 'network/managed_state.cc', 250 'network/managed_state.cc',
251 'network/managed_state.h', 251 'network/managed_state.h',
252 » 'network/network_activation_handler.cc', 252 'network/network_activation_handler.cc',
253 » 'network/network_activation_handler.h', 253 'network/network_activation_handler.h',
254 'network/network_cert_migrator.cc', 254 'network/network_cert_migrator.cc',
255 'network/network_cert_migrator.h', 255 'network/network_cert_migrator.h',
256 'network/network_change_notifier_chromeos.cc', 256 'network/network_change_notifier_chromeos.cc',
257 'network/network_change_notifier_chromeos.h', 257 'network/network_change_notifier_chromeos.h',
258 'network/network_change_notifier_factory_chromeos.cc', 258 'network/network_change_notifier_factory_chromeos.cc',
259 'network/network_change_notifier_factory_chromeos.h', 259 'network/network_change_notifier_factory_chromeos.h',
260 'network/network_configuration_handler.cc', 260 'network/network_configuration_handler.cc',
261 'network/network_configuration_handler.h', 261 'network/network_configuration_handler.h',
262 'network/network_connection_handler.cc', 262 'network/network_connection_handler.cc',
263 'network/network_connection_handler.h', 263 'network/network_connection_handler.h',
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 'display/output_configurator.h', 361 'display/output_configurator.h',
362 'display/output_util.cc', 362 'display/output_util.cc',
363 'display/output_util.h', 363 'display/output_util.h',
364 'display/real_output_configurator_delegate.cc', 364 'display/real_output_configurator_delegate.cc',
365 'display/real_output_configurator_delegate.h', 365 'display/real_output_configurator_delegate.h',
366 'ime/xkeyboard.cc', 366 'ime/xkeyboard.cc',
367 'ime/xkeyboard.h', 367 'ime/xkeyboard.h',
368 ], 368 ],
369 }], 369 }],
370 ], 370 ],
371 'include_dirs': [
372 '../skia/config',
373 ],
371 }, 374 },
372 { 375 {
373 # This target contains mocks that can be used to write unit tests. 376 # This target contains mocks that can be used to write unit tests.
374 'target_name': 'chromeos_test_support', 377 'target_name': 'chromeos_test_support',
375 'type': 'static_library', 378 'type': 'static_library',
376 'dependencies': [ 379 'dependencies': [
377 '../build/linux/system.gyp:dbus', 380 '../build/linux/system.gyp:dbus',
378 '../testing/gmock.gyp:gmock', 381 '../testing/gmock.gyp:gmock',
379 'chromeos', 382 'chromeos',
380 'chromeos_test_support_without_gmock', 383 'chromeos_test_support_without_gmock',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 'network/onc/onc_normalizer_unittest.cc', 518 'network/onc/onc_normalizer_unittest.cc',
516 'network/onc/onc_translator_unittest.cc', 519 'network/onc/onc_translator_unittest.cc',
517 'network/onc/onc_utils_unittest.cc', 520 'network/onc/onc_utils_unittest.cc',
518 'network/onc/onc_validator_unittest.cc', 521 'network/onc/onc_validator_unittest.cc',
519 'network/shill_property_handler_unittest.cc', 522 'network/shill_property_handler_unittest.cc',
520 'network/shill_property_util_unittest.cc', 523 'network/shill_property_util_unittest.cc',
521 'power/power_data_collector_unittest.cc', 524 'power/power_data_collector_unittest.cc',
522 'process_proxy/process_output_watcher_unittest.cc', 525 'process_proxy/process_output_watcher_unittest.cc',
523 'process_proxy/process_proxy_unittest.cc', 526 'process_proxy/process_proxy_unittest.cc',
524 'system/name_value_pairs_parser_unittest.cc', 527 'system/name_value_pairs_parser_unittest.cc',
528 '../content/public/common/media_stream_request.cc',
525 ], 529 ],
526 'include_dirs': [ 530 'include_dirs': [
527 '..', 531 '..',
532 '../skia/config',
528 ], 533 ],
529 'conditions': [ 534 'conditions': [
530 [ 'linux_use_tcmalloc==1', { 535 [ 'linux_use_tcmalloc==1', {
531 'dependencies': [ 536 'dependencies': [
532 '../base/allocator/allocator.gyp:allocator', 537 '../base/allocator/allocator.gyp:allocator',
533 ], 538 ],
534 }, 539 },
535 ], 540 ],
536 ], 541 ],
537 }, 542 },
538 { 543 {
539 # Protobuf compiler/generator for power-manager related protocol buffers. 544 # Protobuf compiler/generator for power-manager related protocol buffers.
540 'target_name': 'power_manager_proto', 545 'target_name': 'power_manager_proto',
541 'type': 'static_library', 546 'type': 'static_library',
542 'sources': [ 547 'sources': [
543 '../third_party/cros_system_api/dbus/power_manager/input_event.proto', 548 '../third_party/cros_system_api/dbus/power_manager/input_event.proto',
544 '../third_party/cros_system_api/dbus/power_manager/peripheral_battery_st atus.proto', 549 '../third_party/cros_system_api/dbus/power_manager/peripheral_battery_st atus.proto',
545 '../third_party/cros_system_api/dbus/power_manager/policy.proto', 550 '../third_party/cros_system_api/dbus/power_manager/policy.proto',
546 '../third_party/cros_system_api/dbus/power_manager/power_supply_properti es.proto', 551 '../third_party/cros_system_api/dbus/power_manager/power_supply_properti es.proto',
547 '../third_party/cros_system_api/dbus/power_manager/suspend.proto', 552 '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
548 ], 553 ],
549 'variables': { 554 'variables': {
550 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager', 555 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
551 'proto_out_dir': 'chromeos/dbus/power_manager', 556 'proto_out_dir': 'chromeos/dbus/power_manager',
552 }, 557 },
553 'includes': ['../build/protoc.gypi'], 558 'includes': ['../build/protoc.gypi'],
554 }, 559 },
555 ], 560 ],
556 } 561 }
OLDNEW
« chromeos/DEPS ('K') | « chromeos/DEPS ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698