| 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( | 9 gypi_values = exec_script( |
| 10 "//build/gypi_to_gn.py", | 10 "//build/gypi_to_gn.py", |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 } | 131 } |
| 132 | 132 |
| 133 if (enable_one_click_signin) { | 133 if (enable_one_click_signin) { |
| 134 sources += rebase_path( | 134 sources += rebase_path( |
| 135 gypi_values.chrome_browser_ui_one_click_signin_sources, | 135 gypi_values.chrome_browser_ui_one_click_signin_sources, |
| 136 ".", "//chrome") | 136 ".", "//chrome") |
| 137 } | 137 } |
| 138 if (enable_task_manager) { | 138 if (enable_task_manager) { |
| 139 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, | 139 sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources, |
| 140 ".", "//chrome") | 140 ".", "//chrome") |
| 141 if (!toolkit_views) { | 141 if (!toolkit_views || is_mac) { |
| 142 sources -= [ "views/task_manager_view.cc" ] | 142 sources -= [ "views/task_manager_view.cc" ] |
| 143 } | 143 } |
| 144 } | 144 } |
| 145 if (!enable_nacl) { | 145 if (!enable_nacl) { |
| 146 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources, | 146 sources += rebase_path(gypi_values.chrome_browser_ui_nacl_sources, |
| 147 ".", "//chrome") | 147 ".", "//chrome") |
| 148 deps += [ | 148 deps += [ |
| 149 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T
ODO(GYP) | 149 #"//native_client/src/trusted/service_runtime/service_runtime.gyp:sel", T
ODO(GYP) |
| 150 ] | 150 ] |
| 151 } | 151 } |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 ".", "//chrome") | 200 ".", "//chrome") |
| 201 } | 201 } |
| 202 if (toolkit_views) { | 202 if (toolkit_views) { |
| 203 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, | 203 sources += rebase_path(gypi_values.chrome_browser_ui_views_sources, |
| 204 ".", "//chrome") | 204 ".", "//chrome") |
| 205 if (!is_chromeos) { | 205 if (!is_chromeos) { |
| 206 sources += rebase_path( | 206 sources += rebase_path( |
| 207 gypi_values.chrome_browser_ui_views_non_chromeos_sources, | 207 gypi_values.chrome_browser_ui_views_non_chromeos_sources, |
| 208 ".", "//chrome") | 208 ".", "//chrome") |
| 209 } | 209 } |
| 210 if (!is_mac) { |
| 211 sources += rebase_path( |
| 212 gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 213 ".", "//chrome") |
| 214 } |
| 210 if (use_ash) { | 215 if (use_ash) { |
| 211 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, | 216 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, |
| 212 ".", "//chrome") | 217 ".", "//chrome") |
| 213 } | 218 } |
| 214 } | 219 } |
| 215 if (use_aura && !use_ozone && is_desktop_linux) { | 220 if (use_aura && !use_ozone && is_desktop_linux) { |
| 216 deps += [ | 221 deps += [ |
| 217 # gtk2 is the only component that can interact with gtk2 in our new | 222 # gtk2 is the only component that can interact with gtk2 in our new |
| 218 # world. | 223 # world. |
| 219 #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', TODO(GYP) | 224 #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', TODO(GYP) |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 #'../google_update/google_update.gyp:google_update', TODO(GYP) | 351 #'../google_update/google_update.gyp:google_update', TODO(GYP) |
| 347 #'../ui/app_list/app_list.gyp:app_list', TODO(GYP) | 352 #'../ui/app_list/app_list.gyp:app_list', TODO(GYP) |
| 348 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) | 353 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) |
| 349 #'../ui/views/views.gyp:views', TODO(GYP) | 354 #'../ui/views/views.gyp:views', TODO(GYP) |
| 350 ] | 355 ] |
| 351 forward_dependent_configs_from += [ | 356 forward_dependent_configs_from += [ |
| 352 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) | 357 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) |
| 353 #'../ui/views/views.gyp:views', TODO(GYP) | 358 #'../ui/views/views.gyp:views', TODO(GYP) |
| 354 ] | 359 ] |
| 355 } else { # 'OS!="win" | 360 } else { # 'OS!="win" |
| 356 if (use_aura) { | 361 if (toolkit_views) { |
| 357 deps += [ | 362 deps += [ |
| 358 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) | 363 #'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP) |
| 359 #'../ui/views/views.gyp:views', TODO(GYP) | 364 #'../ui/views/views.gyp:views', TODO(GYP) |
| 360 ] | 365 ] |
| 361 } | 366 } |
| 362 } | 367 } |
| 363 if (is_desktop_linux) { | 368 if (is_desktop_linux) { |
| 364 sources += rebase_path(gypi_values.chrome_browser_desktop_linux_sources, | 369 sources += rebase_path(gypi_values.chrome_browser_desktop_linux_sources, |
| 365 ".", "//chrome") | 370 ".", "//chrome") |
| 366 } | 371 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 } | 417 } |
| 413 if (enable_service_discovery) { | 418 if (enable_service_discovery) { |
| 414 sources += rebase_path( | 419 sources += rebase_path( |
| 415 gypi_values.chrome_browser_ui_service_discovery_sources, | 420 gypi_values.chrome_browser_ui_service_discovery_sources, |
| 416 ".", "//chrome") | 421 ".", "//chrome") |
| 417 } | 422 } |
| 418 if (enable_spellcheck) { | 423 if (enable_spellcheck) { |
| 419 deps += [ "//third_party/hunspell" ] | 424 deps += [ "//third_party/hunspell" ] |
| 420 } | 425 } |
| 421 } | 426 } |
| OLD | NEW |