Fixes and enhancements...

chrome/SConscript

 # Copyright (c) 2006-2008 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.
 
 import os
 
 Import(['env'])
 
 env_res = env.Clone()
 env_test = env.Clone()
 env = env.Clone()
 
 install_targets = []
 grit_files = []
 
 
 env.Prepend(
     CPPPATH = [
         'app',
         '$CHROME_DIR/third_party/wtl/include',
     ],
 )
 
 
 # TODO(port)
 if env_res['PLATFORM'] == 'win32':
   env_res.Append(
-      CPPDEFINES = [
-          'GOOGLE_CHROME_BUILD',
-      ],
       CPPPATH = [
           '.',
           '$CHROME_SRC_DIR',
           # For app/chrome_dll.res to #include installer_util_strings.rc.
           '$CHROME_DIR/installer/util',
       ],
       RCFLAGS = [
           ['/l', '0x409'],
       ],
   )
@@ skipping 27 matching lines @@
 ])
 
 env_dll.Prepend(
     CPPPATH = [
         "..",
     ],
     CPPDEFINES = [
         'U_STATIC_IMPLEMENTATION',
         'PNG_USER_CONFIG',
         'CHROME_PNG_WRITE_SUPPORT',
-        'GOOGLE_CHROME_BUILD',
         'LIBXSLT_STATIC',
         'LIBXML_STATIC',
         '_WINDLL',
         'BROWSER_DLL',
         'RENDERER_DLL',
         'PLUGIN_DLL',
     ],
     CCFLAGS = [
         '/TP',
         '/Wp64',
@@ skipping 318 matching lines @@
 ]
 
 # TODO(port)
 if env['PLATFORM'] == 'win32':
   env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins)
 
 env.Command('$DESTINATION_ROOT/resources/inspector',
             '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end',
             Copy('$TARGET', '$SOURCE'),
             source_scanner=DirScanner)