Use BRANDING for IE CEEE. Simplify chrome_dll_version handling.

chrome/chrome_dll.gypi

Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 01f33294dcd5307f4fcfc257b8a81bc28e938582..40dee9edf4efa13cd26317b74068355f912d6a80 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -77,7 +77,7 @@
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
-                'chrome_dll_version',
+                'chrome_version_header',
                 'chrome_resources',
                 'installer_util_strings',
                 'worker',
@@ -94,7 +94,7 @@
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
-                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+                'app/chrome_dll_version.rc',
 
                 '../webkit/glue/resources/aliasb.cur',
                 '../webkit/glue/resources/cell.cur',
@@ -124,6 +124,10 @@
                 #'app/check_dependents.bat',
                 #'app/chrome.dll.deps',
               ],
+              'include_dirs': [
+                # For version.h
+                '<(SHARED_INTERMEDIATE_DIR)',
+              ],
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
@@ -560,11 +564,13 @@
           },
           'include_dirs': [
             '..',
+            # For version.h
+            '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'dependencies': [
             '<@(nacl_win64_dependencies)',
-            'chrome_dll_version',
             'nacl_win64',
+            'chrome_version_header',

[MAD, 2010/11/26 13:28:16]

Why after nacl?

[Jói, 2010/11/26 16:07:28]

No reason, I moved it to the first line of dependencies.

           ],
           'defines': [
             '<@(nacl_win64_defines)',
@@ -573,9 +579,10 @@
             'app/chrome_command_ids.h',
             'app/chrome_dll_resource.h',
             'app/chrome_main.cc',
+            'app/chrome_dll_version.rc',

[MAD, 2010/11/26 13:28:16]

above chrome_main?

[Jói, 2010/11/26 16:07:28]

Done.

+
             'browser/renderer_host/render_process_host_dummy.cc',
             'common/googleurl_dummy.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
 
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in