Changed mac and win Official Chrome build to drop default app CRXs in the build/installer output.

chrome/chrome_dll.gypi

 # Copyright (c) 2011 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.
 {
   'target_defaults': {
     'variables': {
       'chrome_dll_target': 0,
     },
     'target_conditions': [
       ['chrome_dll_target==1', {
@@ skipping 47 matching lines @@
         ],  # conditions
       }],
     ],
   },
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'variables': {
             'chrome_dll_target': 1,
+            'default_apps_files': [
+              'browser/resources/default_apps/gmail.crx',
+              'browser/resources/default_apps/youtube.crx',
+            ],
             'conditions' : [
               ['OS=="win" and optimize_with_syzygy==1', {
                 # On Windows we use build chrome_dll as an intermediate target
                 # then have a subsequent step which either optimizes it to its
                 # final location, or copies it to its final location, depending
                 # on whether or not optimize_with_syzygy==1.  Please, refer to
                 # chrome_dll_syzygy.gypi for the subsequent defintion of the
                 # Windows chrome_dll target.
                 'dll_target_name': 'chrome_dll_initial',
               }, {
@@ skipping 78 matching lines @@
                       'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
                       'OutputFile': '$(OutDir)\\initial\\chrome.dll',
                     }], ['incremental_chrome_dll==1', {
                       'OutputFile': '$(OutDir)\\initial\\chrome.dll',
                       'UseLibraryDependencyInputs': "true",
                     }],
                   ],
                 },
               },
               'conditions': [
+                ['buildtype=="Official" and branding=="Chrome"', {

[Mark Mentovai, 2011/09/01 21:55:34]

I am positive that this condition is correct for the Mac. Your testing will
reveal whether it’s correct for Windows too.

[SteveT, 2011/09/01 22:39:55]

Yup - it's correct for both. I've actually already tested this for both
platforms for both cases (Official Chrome and not). I'm just re-testing to make
sure my latest gyp changes do indeed work.

+                  'copies': [
+                    {
+                      # This location is for the win build. The chrome.release

[Mark Mentovai, 2011/09/01 21:55:34]

win = Windows.

[SteveT, 2011/09/01 22:39:55]

Done.

+                      # file ensures that these files are copied into the
+                      # installer.
+                      'destination': '<(PRODUCT_DIR)/default_apps',
+                      'files': [
+                        '<@(default_apps_files)',
+                      ]
+                    },
+                  ],
+                }],
                 ['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
                   # Linking to a different directory and then hardlinking back
                   # to OutDir is a workaround to avoid having the .ilk for
                   # chrome.exe and chrome.dll conflicting. See crbug.com/92528
                   # for more information. Done on the dll instead of the exe so
                   # that people launching from VS don't need to modify
                   # $(TargetPath) for the exe.
                   'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(OutDir)\\initial\\chrome.dll $(OutDir)\\chrome.dll'
                 }]
               ]
@@ skipping 407 matching lines @@
                   'conditions': [
                     ['debug_devtools!=0', {
                       'files': [
                          '<(PRODUCT_DIR)/resources/inspector',
                       ],
                     }],
                   ],
                 },
               ],
               'conditions': [
+                ['buildtype=="Official" and branding=="Chrome"', {
+                  'copies': [
+                    {
+                      # This location is for the mac build.

[Mark Mentovai, 2011/09/01 21:55:34]

Mac has a capital M.

[SteveT, 2011/09/01 22:39:55]

Done.

+                      'destination':
+                          '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps',
+                      'files': [
+                        '<@(default_apps_files)',
+                      ]
+                    },
+                  ],
+                }],
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
                   'sources': [
                     'app/breakpad_mac.mm',
                     'app/breakpad_mac.h',
                   ],
                   'dependencies': [
@@ skipping 147 matching lines @@
                   'LinkIncremental': '<(msvs_debug_link_nonincremental)',
                 },
               },
             },
           },
         },  # target chrome_dll
       ],
     }],
   ],
 }