Remove the Chrome Frame preprocessor define in chrome_constants.cc

chrome/common/chrome_paths_mac.mm

 // Copyright (c) 2006-2008 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 "chrome/common/chrome_paths_internal.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_constants.h"
 
 namespace chrome {
 
 bool GetDefaultUserDataDirectory(FilePath* result) {
   bool success = false;
   if (result && PathService::Get(base::DIR_APP_DATA, result)) {
 #if defined(GOOGLE_CHROME_BUILD)
     *result = result->Append("Google").Append("Chrome");
 #else
     *result = result->Append("Chromium");
 #endif
     success = true;
   }
   return success;
 }
 
+bool GetChromeFrameUserDataDirectory(FilePath* result) {
+  bool success = false;
+  if (result && PathService::Get(base::DIR_APP_DATA, result)) {
+#if defined(GOOGLE_CHROME_BUILD)
+    *result = result->Append("Google").Append("Chrome Frame");
+#else
+    *result = result->Append("Chrome Frame");
+#endif

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

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]

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
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.

+    success = true;
+  }
+  return success;
+}
+
 bool GetUserDocumentsDirectory(FilePath* result) {
   bool success = false;
   NSArray* docArray =
       NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
                                           NSUserDomainMask,
                                           YES);
   if ([docArray count] && result) {
     *result = FilePath([[docArray objectAtIndex:0] fileSystemRepresentation]);
     success = true;
   }
@@ skipping 59 matching lines @@
   // needed to compute the framework's path are also effectively free, so that
   // is the approach that is used here.  NSBundle is also documented as being
   // not thread-safe, and thread safety may be a concern here.
 
   // The framework bundle is at a known path and name from the browser .app's
   // versioned directory.
   return GetVersionedDirectory().Append(kFrameworkName);
 }
 
 }  // namespace chrome