| 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  209           gypi_values.chrome_browser_ui_views_non_mac_sources, |  209           gypi_values.chrome_browser_ui_views_non_mac_sources, | 
|  210           ".", "//chrome") |  210           ".", "//chrome") | 
|  211     } |  211     } | 
|  212     if (use_ash) { |  212     if (use_ash) { | 
|  213       sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, |  213       sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, | 
|  214                              ".", "//chrome") |  214                              ".", "//chrome") | 
|  215       } |  215       } | 
|  216   } |  216   } | 
|  217   if (use_aura && !use_ozone && is_desktop_linux) { |  217   if (use_aura && !use_ozone && is_desktop_linux) { | 
|  218     deps += [ |  218     deps += [ | 
 |  219       "//build/config/linux:gio", | 
|  219       # gtk2 is the only component that can interact with gtk2 in our new |  220       # gtk2 is the only component that can interact with gtk2 in our new | 
|  220       # world. |  221       # world. | 
|  221       #'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',  TODO(GYP) |  222       "//chrome/browser/ui/libgtk2ui", | 
|  222       "//build/config/linux:gio", |  | 
|  223     ] |  223     ] | 
|  224   } |  224   } | 
|  225   if (is_win || is_mac || is_desktop_linux) { |  225   if (is_win || is_mac || is_desktop_linux) { | 
|  226     sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, |  226     sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, | 
|  227                            ".", "//chrome") |  227                            ".", "//chrome") | 
|  228   } |  228   } | 
|  229   if (use_aura) { |  229   if (use_aura) { | 
|  230     sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources, |  230     sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources, | 
|  231                            ".", "//chrome") |  231                            ".", "//chrome") | 
|  232     deps += [ |  232     deps += [ | 
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  411     script = "//chrome/tools/build/mac/generate_localizer" |  411     script = "//chrome/tools/build/mac/generate_localizer" | 
|  412     sources = [ ] |  412     sources = [ ] | 
|  413     table_path = "$target_gen_dir/ui_localizer_table.h" |  413     table_path = "$target_gen_dir/ui_localizer_table.h" | 
|  414     outputs = [ table_path ] |  414     outputs = [ table_path ] | 
|  415     args = [ rebase_path(table_path, root_build_dir) ] + |  415     args = [ rebase_path(table_path, root_build_dir) ] + | 
|  416              rebase_path(nib_gypi_values.mac_translated_xibs, |  416              rebase_path(nib_gypi_values.mac_translated_xibs, | 
|  417                          root_build_dir, |  417                          root_build_dir, | 
|  418                          "//chrome") |  418                          "//chrome") | 
|  419   } |  419   } | 
|  420 } |  420 } | 
| OLD | NEW |