| 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  180     sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources, |  180     sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources, | 
|  181                            ".", "//chrome") |  181                            ".", "//chrome") | 
|  182   } |  182   } | 
|  183   if (use_cups) { |  183   if (use_cups) { | 
|  184     configs += [ "//printing:cups" ] |  184     configs += [ "//printing:cups" ] | 
|  185   } |  185   } | 
|  186   if (use_ash) { |  186   if (use_ash) { | 
|  187     sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources, |  187     sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources, | 
|  188                            ".", "//chrome") |  188                            ".", "//chrome") | 
|  189     deps += [ |  189     deps += [ | 
 |  190       "//ash", | 
|  190       "//ash:ash_with_content", |  191       "//ash:ash_with_content", | 
 |  192       "//ash/strings", | 
 |  193       "//components/user_manager", | 
|  191     ] |  194     ] | 
|  192     if (!is_chromeos) { |  195     if (!is_chromeos) { | 
|  193       sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, |  196       sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, | 
|  194                              ".", "//chrome") |  197                              ".", "//chrome") | 
|  195     } |  198     } | 
|  196   } else {  # Not ash. |  199   } else {  # Not ash. | 
|  197     sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, |  200     sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, | 
|  198                            ".", "//chrome") |  201                            ".", "//chrome") | 
|  199   } |  202   } | 
|  200   if (toolkit_views) { |  203   if (toolkit_views) { | 
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  412     script = "//chrome/tools/build/mac/generate_localizer" |  415     script = "//chrome/tools/build/mac/generate_localizer" | 
|  413     sources = [ ] |  416     sources = [ ] | 
|  414     table_path = "$target_gen_dir/ui_localizer_table.h" |  417     table_path = "$target_gen_dir/ui_localizer_table.h" | 
|  415     outputs = [ table_path ] |  418     outputs = [ table_path ] | 
|  416     args = [ rebase_path(table_path, root_build_dir) ] + |  419     args = [ rebase_path(table_path, root_build_dir) ] + | 
|  417              rebase_path(nib_gypi_values.mac_translated_xibs, |  420              rebase_path(nib_gypi_values.mac_translated_xibs, | 
|  418                          root_build_dir, |  421                          root_build_dir, | 
|  419                          "//chrome") |  422                          "//chrome") | 
|  420   } |  423   } | 
|  421 } |  424 } | 
| OLD | NEW |