| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 } | 191 } |
| 192 } else { # Not ash. | 192 } else { # Not ash. |
| 193 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, | 193 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, |
| 194 ".", | 194 ".", |
| 195 "//chrome") | 195 "//chrome") |
| 196 } | 196 } |
| 197 if (toolkit_views) { | 197 if (toolkit_views) { |
| 198 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, | 198 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, |
| 199 ".", | 199 ".", |
| 200 "//chrome") | 200 "//chrome") |
| 201 deps += [ "//components/constrained_window" ] | 201 deps += [ |
| 202 "//components/constrained_window", |
| 203 "//extensions/components/native_app_window", |
| 204 ] |
| 202 if (!is_chromeos) { | 205 if (!is_chromeos) { |
| 203 sources += | 206 sources += |
| 204 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, | 207 rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources, |
| 205 ".", | 208 ".", |
| 206 "//chrome") | 209 "//chrome") |
| 207 } | 210 } |
| 208 if (!is_mac) { | 211 if (!is_mac) { |
| 209 sources += | 212 sources += |
| 210 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 213 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 211 ".", | 214 ".", |
| 212 "//chrome") | 215 "//chrome") |
| 213 deps += [ "//extensions/components/native_app_window" ] | |
| 214 if (is_chromeos) { | 216 if (is_chromeos) { |
| 215 # TODO(GYP): crbug.com/481629. These files should probably not be | 217 # TODO(GYP): crbug.com/481629. These files should probably not be |
| 216 # a part of ui_views_non_mac_sources at all. | 218 # a part of ui_views_non_mac_sources at all. |
| 217 sources -= [ | 219 sources -= [ |
| 218 "views/frame/opaque_browser_frame_view.cc", | 220 "views/frame/opaque_browser_frame_view.cc", |
| 219 "views/frame/opaque_browser_frame_view.h", | 221 "views/frame/opaque_browser_frame_view.h", |
| 220 "views/frame/opaque_browser_frame_view_linux.cc", | 222 "views/frame/opaque_browser_frame_view_linux.cc", |
| 221 "views/frame/opaque_browser_frame_view_linux.h", | 223 "views/frame/opaque_browser_frame_view_linux.h", |
| 222 ] | 224 ] |
| 223 } | 225 } |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 ] | 306 ] |
| 305 if (mac_views_browser) { | 307 if (mac_views_browser) { |
| 306 sources += rebase_path( | 308 sources += rebase_path( |
| 307 gypi_values.chrome_browser_ui_views_mac_experimental_sources, | 309 gypi_values.chrome_browser_ui_views_mac_experimental_sources, |
| 308 ".", | 310 ".", |
| 309 "//chrome") | 311 "//chrome") |
| 310 sources += | 312 sources += |
| 311 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 313 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 312 ".", | 314 ".", |
| 313 "//chrome") | 315 "//chrome") |
| 314 deps += [ "//extensions/components/native_app_window" ] | |
| 315 } else { | 316 } else { |
| 316 sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources, | 317 sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources, |
| 317 ".", | 318 ".", |
| 318 "//chrome") | 319 "//chrome") |
| 319 } | 320 } |
| 320 include_dirs = [ "$target_gen_dir" ] | 321 include_dirs = [ "$target_gen_dir" ] |
| 321 libs += [ "Quartz.framework" ] | 322 libs += [ "Quartz.framework" ] |
| 322 configs += | 323 configs += |
| 323 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ] | 324 [ "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config" ] |
| 324 } else { # non-Mac. | 325 } else { # non-Mac. |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 "//chrome/browser", | 514 "//chrome/browser", |
| 514 "//content/public/browser", | 515 "//content/public/browser", |
| 515 "//content/public/common", | 516 "//content/public/common", |
| 516 "//content/test:test_support", | 517 "//content/test:test_support", |
| 517 "//net:test_support", | 518 "//net:test_support", |
| 518 "//skia", | 519 "//skia", |
| 519 "//testing/gtest", | 520 "//testing/gtest", |
| 520 "//ui/base", | 521 "//ui/base", |
| 521 ] | 522 ] |
| 522 } | 523 } |
| OLD | NEW |