diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:25:34 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:25:34 +0000 |
| commit | fd1e44cd31fc8c90d39479a5fe4bae6019a989b3 (patch) | |
| tree | c615848c4a19eabd5b30918b4c233796136ef986 /chrome/common/chrome_constants.cc | |
| parent | 7a28f1690831eeb3c33d259a7bad9e676ce41ed7 (diff) | |
| download | chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.zip chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.tar.gz chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.tar.bz2 | |
Remove the Chrome Frame preprocessor define in chrome_constants.cc and deal with resulting fallout.
Also, remove several instances of Chrome Frame using wstrings instead of FilePaths.
The main goal of this patch is to move towards ensuring that Chrome Frame and Google Chrome share binary-identical exes and dlls except for setup.exe and mini_installer.exe.
Review URL: http://codereview.chromium.org/338025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_constants.cc')
| -rw-r--r-- | chrome/common/chrome_constants.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index cd21474..6a6ad28 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -50,10 +50,7 @@ const FilePath::CharType kHelperProcessExecutablePath[] = const FilePath::CharType kFrameworkName[] = FPL(PRODUCT_STRING " Framework.framework"); #endif // OS_MACOSX -#if defined(CHROME_FRAME_BUILD) -const wchar_t kBrowserAppName[] = L"ChromeFrame"; -const char kStatsFilename[] = "ChromeFrameStats2"; -#elif defined(GOOGLE_CHROME_BUILD) +#if defined(GOOGLE_CHROME_BUILD) const wchar_t kBrowserAppName[] = L"Chrome"; const char kStatsFilename[] = "ChromeStats2"; #else |