| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2012 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 # IMPORTANT: |     5 # IMPORTANT: | 
|     6 # Please don't directly include this file if you are building via gyp_chromium, |     6 # Please don't directly include this file if you are building via gyp_chromium, | 
|     7 # since gyp_chromium is automatically forcing its inclusion. |     7 # since gyp_chromium is automatically forcing its inclusion. | 
|     8 { |     8 { | 
|     9   # Variables expected to be overriden on the GYP command line (-D) or by |     9   # Variables expected to be overriden on the GYP command line (-D) or by | 
|    10   # ~/.gyp/include.gypi. |    10   # ~/.gyp/include.gypi. | 
| (...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1146       }], |  1146       }], | 
|  1147     ], |  1147     ], | 
|  1148  |  1148  | 
|  1149     # List of default apps to install in new profiles.  The first list contains |  1149     # List of default apps to install in new profiles.  The first list contains | 
|  1150     # the source files as found in svn.  The second list, used only for linux, |  1150     # the source files as found in svn.  The second list, used only for linux, | 
|  1151     # contains the destination location for each of the files.  When a crx |  1151     # contains the destination location for each of the files.  When a crx | 
|  1152     # is added or removed from the list, the chrome/browser/resources/ |  1152     # is added or removed from the list, the chrome/browser/resources/ | 
|  1153     # default_apps/external_extensions.json file must also be updated. |  1153     # default_apps/external_extensions.json file must also be updated. | 
|  1154     'default_apps_list': [ |  1154     'default_apps_list': [ | 
|  1155       'browser/resources/default_apps/external_extensions.json', |  1155       'browser/resources/default_apps/external_extensions.json', | 
|  1156       'browser/resources/default_apps/docs.crx', |  | 
|  1157       'browser/resources/default_apps/gmail.crx', |  1156       'browser/resources/default_apps/gmail.crx', | 
|  1158       'browser/resources/default_apps/search.crx', |  1157       'browser/resources/default_apps/search.crx', | 
|  1159       'browser/resources/default_apps/youtube.crx', |  1158       'browser/resources/default_apps/youtube.crx', | 
|  1160     ], |  1159     ], | 
|  1161     'default_apps_list_linux_dest': [ |  1160     'default_apps_list_linux_dest': [ | 
|  1162       '<(PRODUCT_DIR)/default_apps/external_extensions.json', |  1161       '<(PRODUCT_DIR)/default_apps/external_extensions.json', | 
|  1163       '<(PRODUCT_DIR)/default_apps/docs.crx', |  | 
|  1164       '<(PRODUCT_DIR)/default_apps/gmail.crx', |  1162       '<(PRODUCT_DIR)/default_apps/gmail.crx', | 
|  1165       '<(PRODUCT_DIR)/default_apps/search.crx', |  1163       '<(PRODUCT_DIR)/default_apps/search.crx', | 
|  1166       '<(PRODUCT_DIR)/default_apps/youtube.crx', |  1164       '<(PRODUCT_DIR)/default_apps/youtube.crx', | 
|  1167     ], |  1165     ], | 
|  1168   }, |  1166   }, | 
|  1169   'target_defaults': { |  1167   'target_defaults': { | 
|  1170     'variables': { |  1168     'variables': { | 
|  1171       # The condition that operates on chromium_code is in a target_conditions |  1169       # The condition that operates on chromium_code is in a target_conditions | 
|  1172       # section, and will not have access to the default fallback value of |  1170       # section, and will not have access to the default fallback value of | 
|  1173       # chromium_code at the top of this file, or to the chromium_code |  1171       # chromium_code at the top of this file, or to the chromium_code | 
| (...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3088     # settings in target dicts.  SYMROOT is a special case, because many other |  3086     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  3089     # Xcode variables depend on it, including variables such as |  3087     # Xcode variables depend on it, including variables such as | 
|  3090     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  3088     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  3091     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  3089     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  3092     # files to appear (when present) in the UI as actual files and not red |  3090     # files to appear (when present) in the UI as actual files and not red | 
|  3093     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  3091     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  3094     # and therefore SYMROOT, needs to be set at the project level. |  3092     # and therefore SYMROOT, needs to be set at the project level. | 
|  3095     'SYMROOT': '<(DEPTH)/xcodebuild', |  3093     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  3096   }, |  3094   }, | 
|  3097 } |  3095 } | 
| OLD | NEW |