Use BRANDING settings for IE CEEE. Simplify chrome_dll_version handling.

Adding new CEEE_PRODUCT_FULLNAME key to the BRANDING file. Adapting version.h.in to define a preprocessor constant for it. Using this and the other version/product name constants in IE CEEE's .rc files.

Piggybacking on MAD's recent changes to make %NAME% a variable in the .rgs files to fairly easily get the product name from branding in there. Naming the toolband with the product name directly (as it is what shows up in IE's View/Toolbars menu), the BHO with an added "Helper" and the broker with an added "Broker".

Removing the 'chrome_dll_version' target from chrome.gyp, and skipping code generation of chrome_dll_version.rc. Instead we have a source file with that name, that includes the verson.h generated by the 'chrome_version_header' target. This is cleaner and less code generation.

Fixing 'chrome_dll_nacl64' target, it seemed like it wanted to have version information, but it didn't.

Cleaning up the way sources are specified in several of the chrome_tests.gypi targets, to use fewer source! statements just to remove source files that are Windows-only (put them in the Windows-only section instead).

BUG=none
TEST=Visible change should be that user-visible names in Chromium builds are like "Chromium Extensions Execution Environment" (with "Broker" or "Helper" appended when appropriate), i.e. they lose the "Google" part.

Review URL: http://codereview.chromium.org/5360002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67457 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 81 insertions, 133 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 888bcd9..b236691 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -160,8 +160,6 @@ BEGIN
     "\0"
 END
 
-#else     // APSTUDIO_INVOKED
-#include "chrome_dll_version.rc"
 #endif    // APSTUDIO_INVOKED
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/app/chrome_dll_version.rc b/chrome/app/chrome_dll_version.rc
new file mode 100644
index 0000000..2efc993
--- /dev/null
+++ b/chrome/app/chrome_dll_version.rc
@@ -0,0 +1,44 @@
+// Copyright (c) 2010 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.
+
+#include <verrsrc.h>
+
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION CHROME_VERSION
+ PRODUCTVERSION CHROME_VERSION
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", COMPANY_FULLNAME_STRING
+            VALUE "FileDescription", PRODUCT_FULLNAME_STRING
+            VALUE "FileVersion", CHROME_VERSION_STRING
+            VALUE "InternalName", "chrome_dll"
+            VALUE "LegalCopyright", COPYRIGHT_STRING
+            VALUE "OriginalFilename", "chrome.dll"
+            VALUE "ProductName", PRODUCT_FULLNAME_STRING
+            VALUE "ProductVersion", CHROME_VERSION_STRING
+            VALUE "CompanyShortName", COMPANY_SHORTNAME_STRING
+            VALUE "ProductShortName", PRODUCT_SHORTNAME_STRING
+            VALUE "LastChange", LASTCHANGE_STRING
+            VALUE "Official Build", OFFICIAL_BUILD_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/chrome/app/chrome_dll_version.rc.version b/chrome/app/chrome_dll_version.rc.version
deleted file mode 100644
index 7554088..0000000
--- a/chrome/app/chrome_dll_version.rc.version
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
- PRODUCTVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "@COMPANY_FULLNAME@"
-            VALUE "FileDescription", "@PRODUCT_FULLNAME@"
-            VALUE "FileVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
-            VALUE "InternalName", "chrome_dll"
-            VALUE "LegalCopyright", "@COPYRIGHT@"
-            VALUE "OriginalFilename", "chrome.dll"
-            VALUE "ProductName", "@PRODUCT_FULLNAME@"
-            VALUE "ProductVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
-            VALUE "CompanyShortName", "@COMPANY_SHORTNAME@"
-            VALUE "ProductShortName", "@PRODUCT_SHORTNAME@"
-            VALUE "LastChange", "@LASTCHANGE@"
-            VALUE "Official Build", "@OFFICIAL_BUILD@"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
index 159e194..8ffbb91 100644
--- a/chrome/app/theme/chromium/BRANDING
+++ b/chrome/app/theme/chromium/BRANDING
@@ -2,4 +2,5 @@ COMPANY_FULLNAME=The Chromium Authors
 COMPANY_SHORTNAME=The Chromium Authors
 PRODUCT_FULLNAME=Chromium
 PRODUCT_SHORTNAME=Chromium
-COPYRIGHT=Copyright (C) 2006-2009 The Chromium Authors. All Rights Reserved.
+CEEE_PRODUCT_FULLNAME=Chromium Extensions Execution Environment
+COPYRIGHT=Copyright (C) 2006-2010 The Chromium Authors. All Rights Reserved.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7088b7f..ae48340 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1678,61 +1678,9 @@
           ],
         },
         {
-          'target_name': 'chrome_dll_version',
-          'type': 'none',
-          #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
-          'dependencies': [
-            '../build/util/build_util.gyp:lastchange',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
-            ],
-          },
-          'actions': [
-            {
-              'action_name': 'version',
-              'variables': {
-                'lastchange_path':
-                  '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
-                'template_input_path': 'app/chrome_dll_version.rc.version',
-              },
-              'conditions': [
-                [ 'branding == "Chrome"', {
-                  'variables': {
-                     'branding_path': 'app/theme/google_chrome/BRANDING',
-                  },
-                }, { # else branding!="Chrome"
-                  'variables': {
-                     'branding_path': 'app/theme/chromium/BRANDING',
-                  },
-                }],
-              ],
-              'inputs': [
-                '<(template_input_path)',
-                '<(version_path)',
-                '<(branding_path)',
-                '<(lastchange_path)',
-              ],
-              'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
-              ],
-              'action': [
-                'python',
-                '<(version_py_path)',
-                '-f', '<(version_path)',
-                '-f', '<(branding_path)',
-                '-f', '<(lastchange_path)',
-                '<(template_input_path)',
-                '<@(_outputs)',
-              ],
-              'message': 'Generating version information in <(_outputs)'
-            },
-          ],
-        },
-        {
           'target_name': 'chrome_version_header',
           'type': 'none',
+          'hard_dependency': 1,
           'dependencies': [
             '../build/util/build_util.gyp:lastchange',
           ],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 01f3329..6975efe 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,10 +564,12 @@
           },
           'include_dirs': [
             '..',
+            # For version.h
+            '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'dependencies': [
+            'chrome_version_header',
             '<@(nacl_win64_dependencies)',
-            'chrome_dll_version',
             'nacl_win64',
           ],
           'defines': [
@@ -572,10 +578,11 @@
           'sources': [
             'app/chrome_command_ids.h',
             'app/chrome_dll_resource.h',
+            'app/chrome_dll_version.rc',
             'app/chrome_main.cc',
+
             '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
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4964d16..de8eaeb 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -28,8 +28,8 @@
         'renderer',
         'chrome_resources',
         'chrome_strings',
-        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'theme_resources',
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
@@ -384,7 +384,7 @@
           ],
           'dependencies': [
             '../app/app.gyp:app_resources',
-            'chrome.gyp:chrome_dll_version',
+            'chrome.gyp:chrome_version_header',
             'chrome.gyp:crash_service',  # run time dependency
             'chrome.gyp:installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
@@ -401,6 +401,7 @@
             '../webkit/glue/resources/zoom_out.cur',
 
             'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
             'test/data/resource.rc',
 
             # TODO:  It would be nice to have these pulled in
@@ -694,7 +695,7 @@
         'test/webdriver/commands/session_with_id.h',
         'test/webdriver/commands/session_with_id.cc',
         'test/webdriver/commands/source_command.h',
-        'test/webdriver/commands/source_command.cc',        
+        'test/webdriver/commands/source_command.cc',
         'test/webdriver/commands/speed_command.h',
         'test/webdriver/commands/speed_command.cc',
         'test/webdriver/commands/title_command.h',
@@ -997,7 +998,6 @@
       },
       'sources': [
         'app/breakpad_mac_stubs.mm',
-        'app/chrome_dll.rc',
         # All unittests in browser, common, renderer and service.
         'browser/about_flags_unittest.cc',
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
@@ -1800,7 +1800,7 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
@@ -1817,6 +1817,9 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
+
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
@@ -1853,7 +1856,6 @@
           },
         }, { # else: OS != "win"
           'sources!': [
-            'app/chrome_dll.rc',
             'browser/accessibility/browser_accessibility_win_unittest.cc',
             'browser/bookmarks/bookmark_codec_unittest.cc',
             'browser/bookmarks/bookmark_drag_data_unittest.cc',
@@ -1918,10 +1920,6 @@
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
-        'app/chrome_command_ids.h',
-        'app/chrome_dll.rc',
-        'app/chrome_dll_resource.h',
-        'app/chrome_dll_version.rc.version',
         'browser/autocomplete/autocomplete_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browsing_data_database_helper_browsertest.cc',
@@ -2134,9 +2132,12 @@
         }],
         ['OS=="win"', {
           'sources': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll_resource.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
@@ -2148,7 +2149,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
@@ -2170,10 +2171,6 @@
           }
         }, { # else: OS != "win"
           'sources!': [
-            'app/chrome_command_ids.h',
-            'app/chrome_dll.rc',
-            'app/chrome_dll_resource.h',
-            'app/chrome_dll_version.rc.version',
             'browser/extensions/extension_popup_apitest.cc',
             'browser/extensions/extension_rlz_apitest.cc',
             # TODO(jam): http://crbug.com/15101 These tests fail on Linux and
@@ -2268,7 +2265,6 @@
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
-        'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
@@ -2277,14 +2273,15 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'sources': [
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
@@ -2731,10 +2728,6 @@
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
-        'app/chrome_command_ids.h',
-        'app/chrome_dll.rc',
-        'app/chrome_dll_resource.h',
-        'app/chrome_dll_version.rc.version',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_common_test.h',
         'browser/password_manager/password_form_data.cc',
@@ -2786,7 +2779,6 @@
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
-        'test/data/resource.rc',
       ],
       'conditions': [
         # Plugin code.
@@ -2816,9 +2808,13 @@
         }],
         ['OS=="win"', {
           'sources': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_resource.h',
+            'app/chrome_dll_version.rc',
+            'test/data/resource.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
           ],
@@ -2826,7 +2822,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
@@ -2846,12 +2842,6 @@
               },
             },
           },
-        }, { # else: OS != "win"
-          'sources!': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc.version',
-            'test/data/resource.rc',
-          ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
diff --git a/chrome/version.h.in b/chrome/version.h.in
index ed4004b0..924586c 100644
--- a/chrome/version.h.in
+++ b/chrome/version.h.in
@@ -17,6 +17,7 @@
 #define COMPANY_SHORTNAME_STRING "@COMPANY_SHORTNAME@"
 #define PRODUCT_FULLNAME_STRING "@PRODUCT_FULLNAME@"
 #define PRODUCT_SHORTNAME_STRING "@PRODUCT_SHORTNAME@"
+#define CEEE_PRODUCT_FULLNAME_STRING "@CEEE_PRODUCT_FULLNAME@"
 #define COPYRIGHT_STRING "@COPYRIGHT@"
 #define OFFICIAL_BUILD_STRING "@OFFICIAL_BUILD@"