| 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 } | 277 } |
| 278 if (is_win || is_mac || is_desktop_linux) { | 278 if (is_win || is_mac || is_desktop_linux) { |
| 279 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, | 279 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, |
| 280 ".", | 280 ".", |
| 281 "//chrome") | 281 "//chrome") |
| 282 if (is_mac && !mac_views_browser) { | 282 if (is_mac && !mac_views_browser) { |
| 283 sources -= [ | 283 sources -= [ |
| 284 # This is not explicitly excluded in GYP, but I think the static | 284 # This is not explicitly excluded in GYP, but I think the static |
| 285 # library linking rules means it's never referenced when compiling in | 285 # library linking rules means it's never referenced when compiling in |
| 286 # non-Views mode on Mac. It appears not to link in that case. | 286 # non-Views mode on Mac. It appears not to link in that case. |
| 287 "views/frame/avatar_button_bridge.cc", |
| 288 "views/frame/avatar_button_bridge.h", |
| 287 "views/profiles/new_avatar_button.cc", | 289 "views/profiles/new_avatar_button.cc", |
| 288 "views/profiles/new_avatar_button.h", | 290 "views/profiles/new_avatar_button.h", |
| 289 ] | 291 ] |
| 290 } | 292 } |
| 291 } | 293 } |
| 292 if (use_aura) { | 294 if (use_aura) { |
| 293 sources += | 295 sources += |
| 294 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") | 296 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") |
| 295 deps += [ | 297 deps += [ |
| 296 # aura uses some of ash resources. | 298 # aura uses some of ash resources. |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 "//chrome/browser", | 608 "//chrome/browser", |
| 607 "//content/public/browser", | 609 "//content/public/browser", |
| 608 "//content/public/common", | 610 "//content/public/common", |
| 609 "//content/test:test_support", | 611 "//content/test:test_support", |
| 610 "//net:test_support", | 612 "//net:test_support", |
| 611 "//skia", | 613 "//skia", |
| 612 "//testing/gtest", | 614 "//testing/gtest", |
| 613 "//ui/base", | 615 "//ui/base", |
| 614 ] | 616 ] |
| 615 } | 617 } |
| OLD | NEW |