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 | 8 |
9 gypi_values = exec_script("//build/gypi_to_gn.py", | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
10 [ rebase_path("../../chrome_browser_ui.gypi") ], | 10 [ rebase_path("../../chrome_browser_ui.gypi") ], |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
237 sources += | 237 sources += |
238 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 238 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
239 ".", | 239 ".", |
240 "//chrome") | 240 "//chrome") |
241 if (enable_extensions) { | 241 if (enable_extensions) { |
242 sources += rebase_path( | 242 sources += rebase_path( |
243 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources, | 243 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources, |
244 ".", | 244 ".", |
245 "//chrome") | 245 "//chrome") |
246 } | 246 } |
247 if (is_android && !use_aura) { | |
bshe
2015/11/02 16:05:13
I think you can just use if (!use_aura) here.
All
mfomitchev
2015/11/02 16:07:22
Actually it looks like we can just remove this, si
Hadi
2015/11/02 16:33:55
Done.
| |
248 sources -= | |
249 [ "browser/ui/views/frame/native_browser_frame_factory_android.cc" ] | |
250 } | |
247 } | 251 } |
248 if (use_ash) { | 252 if (use_ash) { |
249 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, | 253 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, |
250 ".", | 254 ".", |
251 "//chrome") | 255 "//chrome") |
252 } | 256 } |
253 } else { | 257 } else { |
254 # !toolkit_views | 258 # !toolkit_views |
255 if (!is_ios) { | 259 if (!is_ios) { |
256 deps -= [ "//chrome/browser/ui/views" ] | 260 deps -= [ "//chrome/browser/ui/views" ] |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
585 "//chrome/browser", | 589 "//chrome/browser", |
586 "//content/public/browser", | 590 "//content/public/browser", |
587 "//content/public/common", | 591 "//content/public/common", |
588 "//content/test:test_support", | 592 "//content/test:test_support", |
589 "//net:test_support", | 593 "//net:test_support", |
590 "//skia", | 594 "//skia", |
591 "//testing/gtest", | 595 "//testing/gtest", |
592 "//ui/base", | 596 "//ui/base", |
593 ] | 597 ] |
594 } | 598 } |
OLD | NEW |