Remove the Chrome Frame preprocessor define in chrome_constants.cc

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.

BUG=http://crbug.com/26012,http://crbug.com/24874

[kuchhal, 2009-10-26 23:11:18]

ok but see the comments below (especially about creating a common function to
get User Data dir).

http://codereview.chromium.org/338025/diff/1001/1004
File chrome/installer/setup/uninstall.cc (right):

http://codereview.chromium.org/338025/diff/1001/1004#newcode180
Line 180: // build this path manually since it doesn't use the Chrome default
dir.
May be there needs to be a common function for this?

http://codereview.chromium.org/338025/diff/1001/1004#newcode188
Line 188: user_local_state = user_local_state.Append(FILE_PATH_LITERAL("Chrome
Frame"));
After public release does this need to be called "Chromium Frame"?

[amit, 2009-10-26 23:52:49]

lg

http://codereview.chromium.org/338025/diff/1001/1003
File chrome_frame/utils.cc (right):

http://codereview.chromium.org/338025/diff/1001/1003#newcode569
Line 569: file_util::AppendToPath(path, L"Chrome Frame");
Read product name from the version resource or from wherever we get it?

[robertshield, 2009-10-27 17:44:31]

http://codereview.chromium.org/338025/diff/1001/1004
File chrome/installer/setup/uninstall.cc (right):

http://codereview.chromium.org/338025/diff/1001/1004#newcode180
Line 180: // build this path manually since it doesn't use the Chrome default
dir.
On 2009/10/26 23:11:18, kuchhal wrote:
> May be there needs to be a common function for this?

Moved this into a common function in chrome/common. What do you think of the new
location?

I could keep it in Chrome Frame, but not without refactoring  the Chrome Frame
projects a bit and making setup depend on a  common Chrome Frame lib.

http://codereview.chromium.org/338025/diff/1001/1004#newcode188
Line 188: user_local_state = user_local_state.Append(FILE_PATH_LITERAL("Chrome
Frame"));
On 2009/10/26 23:11:18, kuchhal wrote:
> After public release does this need to be called "Chromium Frame"?

AFAIK, we refer to Chrome Frame as "Chrome Frame" regardless of public release
or not.

http://codereview.chromium.org/338025/diff/1001/1003
File chrome_frame/utils.cc (right):

http://codereview.chromium.org/338025/diff/1001/1003#newcode569
Line 569: file_util::AppendToPath(path, L"Chrome Frame");
On 2009/10/26 23:52:49, amit wrote:
> Read product name from the version resource or from wherever we get it?

I moved this into chrome/common which would make that hard.

[kuchhal, 2009-10-27 18:47:26]

http://codereview.chromium.org/338025/diff/6002/7011
File chrome/common/chrome_paths_linux.cc (right):

http://codereview.chromium.org/338025/diff/6002/7011#newcode77
Line 77: #if defined(GOOGLE_CHROME_BUILD)
I think you want to check for CHROME_FRAME_BUILD?

http://codereview.chromium.org/338025/diff/6002/7009
File chrome/common/chrome_paths_mac.mm (right):

http://codereview.chromium.org/338025/diff/6002/7009#newcode37
Line 37: #endif
I think you want to check for Chrome Frame Build. And this also brings up my
original concern again. Currently Google Chrome and Chromium are separate
products so have their own installation directory as well as User Data
directory.

Will Google Chrome Frame make a Chromium version available? If yes then it
probably needs to install in its own path and have a different User Data dir.

[robertshield, 2009-10-27 19:55:37]

http://codereview.chromium.org/338025/diff/6002/7011
File chrome/common/chrome_paths_linux.cc (right):

http://codereview.chromium.org/338025/diff/6002/7011#newcode77
Line 77: #if defined(GOOGLE_CHROME_BUILD)
On 2009/10/27 18:47:26, kuchhal wrote:
> I think you want to check for CHROME_FRAME_BUILD?

No, I want to check for GOOGLE_CHROME_BUILD (see other comment).

http://codereview.chromium.org/338025/diff/6002/7009
File chrome/common/chrome_paths_mac.mm (right):

http://codereview.chromium.org/338025/diff/6002/7009#newcode37
Line 37: #endif
On 2009/10/27 18:47:26, kuchhal wrote:
> I think you want to check for Chrome Frame Build. 

This method is specific to Chrome Frame and so (as proposed here), is always
present regardless of whether CHROME_FRAME_BUILD is defined. 

The GOOGLE_CHROME_BUILD check here determines whether we put 
things in a "Google" sub-directory or not.

And this also brings up my
> original concern again. Currently Google Chrome and Chromium are separate
> products so have their own installation directory as well as User Data
> directory.
> 
> Will Google Chrome Frame make a Chromium version available? If yes then it
> probably needs to install in its own path and have a different User Data dir.

There aren't any specific plans along these lines. What I'd like to do is keep
GOOGLE_CHROME_BUILD as the gatekeeper flag that determines whether this is an
official release or not and modify the Chrome Frame bits of code to behave
accordingly as I have done here with the user data dir.

[kuchhal, 2009-10-28 15:09:28]

lgtm.

On Tue, Oct 27, 2009 at 12:55 PM, <robertshield@chromium.org> wrote:

>
> http://codereview.chromium.org/338025/diff/6002/7011
> File chrome/common/chrome_paths_linux.cc (right):
>
> http://codereview.chromium.org/338025/diff/6002/7011#newcode77
> Line 77: #if defined(GOOGLE_CHROME_BUILD)
> On 2009/10/27 18:47:26, kuchhal wrote:
>
>> I think you want to check for CHROME_FRAME_BUILD?
>>
>
> No, I want to check for GOOGLE_CHROME_BUILD (see other comment).
>
>
> http://codereview.chromium.org/338025/diff/6002/7009
> File chrome/common/chrome_paths_mac.mm (right):
>
> http://codereview.chromium.org/338025/diff/6002/7009#newcode37
> Line 37: #endif
> On 2009/10/27 18:47:26, kuchhal wrote:
>
>> I think you want to check for Chrome Frame Build.
>>
>
> This method is specific to Chrome Frame and so (as proposed here), is
> always present regardless of whether CHROME_FRAME_BUILD is defined.
>
> The GOOGLE_CHROME_BUILD check here determines whether we put
> things in a "Google" sub-directory or not.
>
>
> And this also brings up my
>
>> original concern again. Currently Google Chrome and Chromium are
>>
> separate
>
>> products so have their own installation directory as well as User Data
>> directory.
>>
>
>  Will Google Chrome Frame make a Chromium version available? If yes
>>
> then it
>
>> probably needs to install in its own path and have a different User
>>
> Data dir.
>
> There aren't any specific plans along these lines. What I'd like to do
> is keep GOOGLE_CHROME_BUILD as the gatekeeper flag that determines
> whether this is an official release or not and modify the Chrome Frame
> bits of code to behave accordingly as I have done here with the user
>
> data dir.
>
> http://codereview.chromium.org/338025
>