OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
8 import("//native_client/build/config/nacl_defines.gni") | 8 import("//native_client/build/config/nacl_defines.gni") |
9 import("//tools/grit/grit_rule.gni") | 9 import("//tools/grit/grit_rule.gni") |
10 | 10 |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 #"../win8/win8.gyp:metro_viewer", TODO(GYP) | 518 #"../win8/win8.gyp:metro_viewer", TODO(GYP) |
519 ] | 519 ] |
520 forward_dependent_configs_from += [ | 520 forward_dependent_configs_from += [ |
521 #"../ui/views/controls/webview/webview.gyp:webview", TODO(GYP) | 521 #"../ui/views/controls/webview/webview.gyp:webview", TODO(GYP) |
522 #"../ui/views/views.gyp:views", TODO(GYP) | 522 #"../ui/views/views.gyp:views", TODO(GYP) |
523 ] | 523 ] |
524 } else { | 524 } else { |
525 # Non-Windows. | 525 # Non-Windows. |
526 sources += rebase_path(gypi_values.chrome_browser_non_win_sources, | 526 sources += rebase_path(gypi_values.chrome_browser_non_win_sources, |
527 ".", "//chrome") | 527 ".", "//chrome") |
528 if (use_aura) { | 528 if (toolkit_views) { |
529 deps += [ | 529 deps += [ |
530 #"../ui/views/controls/webview/webview.gyp:webview", TODO(GYP) | 530 #"../ui/views/controls/webview/webview.gyp:webview", TODO(GYP) |
531 #"../ui/views/views.gyp:views", TODO(GYP) | 531 #"../ui/views/views.gyp:views", TODO(GYP) |
532 ] | 532 ] |
533 # TODO(GYP) why is this needed? Very susicious. | 533 # TODO(GYP) why is this needed? Very susicious. |
534 # "include_dirs": [ | 534 # "include_dirs": [ |
535 # "<(INTERMEDIATE_DIR)/chrome", | 535 # "<(INTERMEDIATE_DIR)/chrome", |
536 # ], | 536 # ], |
537 } | 537 } |
538 } | 538 } |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 # TODO(GYP) write internal action | 656 # TODO(GYP) write internal action |
657 if (false) { #if (is_chrome_branded) { | 657 if (false) { #if (is_chrome_branded) { |
658 action("chrome_internal_resources_gen") { | 658 action("chrome_internal_resources_gen") { |
659 # TODO(GYP) | 659 # TODO(GYP) |
660 } | 660 } |
661 } else { | 661 } else { |
662 group("chrome_internal_resources_gen") { | 662 group("chrome_internal_resources_gen") { |
663 # Empty placeholder. | 663 # Empty placeholder. |
664 } | 664 } |
665 } | 665 } |
OLD | NEW |