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

Side by Side Diff: mojo/mojo.gyp

Issue 275853002: Revert of Wires up view manager to an actual display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | mojo/mojo_examples.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'target_defaults': { 6 'target_defaults': {
7 'conditions': [ 7 'conditions': [
8 ['mojo_shell_debug_url != ""', { 8 ['mojo_shell_debug_url != ""', {
9 'defines': [ 9 'defines': [
10 'MOJO_SHELL_DEBUG=1', 10 'MOJO_SHELL_DEBUG=1',
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 'shell/storage.cc', 497 'shell/storage.cc',
498 'shell/storage.h', 498 'shell/storage.h',
499 'shell/switches.cc', 499 'shell/switches.cc',
500 'shell/switches.h', 500 'shell/switches.h',
501 'shell/task_runners.cc', 501 'shell/task_runners.cc',
502 'shell/task_runners.h', 502 'shell/task_runners.h',
503 'shell/test_child_process.cc', 503 'shell/test_child_process.cc',
504 'shell/test_child_process.h', 504 'shell/test_child_process.h',
505 'shell/url_request_context_getter.cc', 505 'shell/url_request_context_getter.cc',
506 'shell/url_request_context_getter.h', 506 'shell/url_request_context_getter.h',
507 'shell/view_manager_loader.cc',
508 'shell/view_manager_loader.h',
509 ], 507 ],
510 'conditions': [ 508 'conditions': [
511 ['OS=="linux"', { 509 ['OS=="linux"', {
512 'dependencies': [ 510 'dependencies': [
513 '../build/linux/system.gyp:dbus', 511 '../build/linux/system.gyp:dbus',
514 '../dbus/dbus.gyp:dbus', 512 '../dbus/dbus.gyp:dbus',
515 ], 513 ],
516 }], 514 }],
517 ['use_aura==1', { 515 ['use_aura==1', {
518 'dependencies': [ 516 'dependencies': [
519 # These are only necessary as long as we hard code use of ViewManage r. 517 # These are only necessary as long as we hard code use of ViewManage r.
520 '../skia/skia.gyp:skia', 518 '../skia/skia.gyp:skia',
521 'mojo_shell_client', 519 'mojo_shell_client',
522 'mojo_view_manager', 520 'mojo_view_manager',
523 ], 521 ],
524 }, { # use_aura==0
525 'sources!': [
526 'shell/view_manager_loader.cc',
527 'shell/view_manager_loader.h',
528 ],
529 }], 522 }],
530 ], 523 ],
531 }, 524 },
532 { 525 {
533 'target_name': 'mojo_shell_test_support', 526 'target_name': 'mojo_shell_test_support',
534 'type': 'static_library', 527 'type': 'static_library',
535 'dependencies': [ 528 'dependencies': [
536 '../base/base.gyp:base', 529 '../base/base.gyp:base',
537 '../base/base.gyp:base_static', 530 '../base/base.gyp:base_static',
538 '../url/url.gyp:url_lib', 531 '../url/url.gyp:url_lib',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 'aura/screen_mojo.cc', 860 'aura/screen_mojo.cc',
868 'aura/screen_mojo.h', 861 'aura/screen_mojo.h',
869 'aura/window_tree_host_mojo.cc', 862 'aura/window_tree_host_mojo.cc',
870 'aura/window_tree_host_mojo.h', 863 'aura/window_tree_host_mojo.h',
871 ], 864 ],
872 }, 865 },
873 ], 866 ],
874 }], 867 }],
875 ], 868 ],
876 } 869 }
OLDNEW
« no previous file with comments | « no previous file | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698