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