summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 16:10:23 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 16:10:23 +0000
commitf960aaccfcafe0621cd4b9b26cbed8e37e3d62f3 (patch)
treea380ae1658b6a18c60a68daaa8408c8b98b33472 /chrome/app/theme
parentc54e2fb2d612bfeef7a345110599bff4a96deeb5 (diff)
downloadchromium_src-f960aaccfcafe0621cd4b9b26cbed8e37e3d62f3.zip
chromium_src-f960aaccfcafe0621cd4b9b26cbed8e37e3d62f3.tar.gz
chromium_src-f960aaccfcafe0621cd4b9b26cbed8e37e3d62f3.tar.bz2
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
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/chromium/BRANDING3
1 files changed, 2 insertions, 1 deletions
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.