Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

chrome/chrome_dll_bundle.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains resources for the main Mac chromium bundle.
 {
   # The main browser executable's name is <(mac_product_name).
   # Certain things will get confused if two modules in the
   # executable share the same name, so append " Framework" to the
   # product_name used for the framework.  This will result in
@@ skipping 41 matching lines @@
     # needs to exist as a file on disk and not just something in a
     # resource bundle because that's the interface that
     # Authorization Services uses.  Also, Authorization Services
     # can't deal with .icns files.
     'app/theme/default_100_percent/<(theme_dir_name)/product_logo_32.png',
 
     'app/framework-Info.plist',
     '<@(mac_all_xibs)',
     'browser/mac/install.sh',
     '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak',
     '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
     '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
     # Note: pseudo_locales are generated via the packed_resources
     # dependency but not copied to the final target.  See
     # common.gypi for more info.
   ],
   'mac_bundle_resources!': [
     'app/framework-Info.plist',
   ],
   'dependencies': [
@@ skipping 164 matching lines @@
           'ln',
           '-fs',
           '${BUILT_PRODUCTS_DIR}/resources/inspector',
           '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources',
         ],
       }],
     }],
     ['enable_hidpi==1', {
       'mac_bundle_resources': [
         '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',
-      ],
-    }],
-    ['enable_topchrome_md==1', {
-      'mac_bundle_resources': [
-      '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak',
-      ],
-    }],
-    ['enable_topchrome_md==1 and enable_hidpi==1', {
-      'mac_bundle_resources': [
         '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_percent.pak',
       ],
     }],
     ['icu_use_data_file_flag==1', {
       'mac_bundle_resources': [
         '<(PRODUCT_DIR)/icudtl.dat',
       ],
     }],
     ['v8_use_external_startup_data==1', {
       'mac_bundle_resources': [
         '<(PRODUCT_DIR)/natives_blob.bin',
         '<(PRODUCT_DIR)/snapshot_blob.bin',
       ],
     }],
   ],  # conditions
 }