| 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("//chrome/common/features.gni") | 8 import("//chrome/common/features.gni") |
| 9 | 9 |
| 10 gypi_values = exec_script("//build/gypi_to_gn.py", | 10 gypi_values = exec_script("//build/gypi_to_gn.py", |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 "views/profiles/new_avatar_button.h", | 352 "views/profiles/new_avatar_button.h", |
| 353 ] | 353 ] |
| 354 } | 354 } |
| 355 } | 355 } |
| 356 if (use_aura) { | 356 if (use_aura) { |
| 357 sources += | 357 sources += |
| 358 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") | 358 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") |
| 359 deps += [ | 359 deps += [ |
| 360 # aura uses some of ash resources. | 360 # aura uses some of ash resources. |
| 361 "//ash/resources", | 361 "//ash/resources", |
| 362 "//ash/wm/common/resources", | |
| 363 "//ui/aura", | 362 "//ui/aura", |
| 364 "//ui/keyboard", | 363 "//ui/keyboard", |
| 365 "//ui/keyboard:keyboard_with_content", | 364 "//ui/keyboard:keyboard_with_content", |
| 366 "//ui/keyboard:resources", | 365 "//ui/keyboard:resources", |
| 367 "//ui/wm", | 366 "//ui/wm", |
| 368 ] | 367 ] |
| 369 defines += [ "MOJO_SHELL_CLIENT" ] | 368 defines += [ "MOJO_SHELL_CLIENT" ] |
| 370 if (!is_chromeos) { | 369 if (!is_chromeos) { |
| 371 sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos, | 370 sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos, |
| 372 ".", | 371 ".", |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 "//chrome/browser", | 694 "//chrome/browser", |
| 696 "//content/public/browser", | 695 "//content/public/browser", |
| 697 "//content/public/common", | 696 "//content/public/common", |
| 698 "//content/test:test_support", | 697 "//content/test:test_support", |
| 699 "//net:test_support", | 698 "//net:test_support", |
| 700 "//skia", | 699 "//skia", |
| 701 "//testing/gtest", | 700 "//testing/gtest", |
| 702 "//ui/base", | 701 "//ui/base", |
| 703 ] | 702 ] |
| 704 } | 703 } |
| OLD | NEW |