Remove the Chrome Frame preprocessor define in chrome_constants.cc

chrome/common/chrome_paths_linux.cc

 // 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"
 
 #include <glib.h>
 #include <stdlib.h>
 
 #include "base/file_path.h"
@@ skipping 54 matching lines @@
 bool GetDefaultUserDataDirectory(FilePath* result) {
   FilePath config_dir(GetXDGDirectory("XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome");
 #else
   *result = config_dir.Append("chromium");
 #endif
   return true;
 }
 
+bool GetChromeFrameUserDataDirectory(FilePath* result) {
+  FilePath config_dir(GetXDGDirectory("XDG_CONFIG_HOME", ".config"));
+#if defined(GOOGLE_CHROME_BUILD)

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

I think you want to check for CHROME_FRAME_BUILD?

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

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

+  *result = config_dir.Append("google-chrome-frame");
+#else
+  *result = config_dir.Append("chrome-frame");
+#endif
+  return true;
+}
+
 // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 // for a spec on where cache files go.  The net effect for most
 // systems is we use ~/.cache/chromium/ for Chromium and
 // ~/.cache/google-chrome/ for official builds.
 bool GetUserCacheDirectory(FilePath* result) {
   FilePath cache_dir(GetXDGDirectory("XDG_CACHE_HOME", ".cache"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = cache_dir.Append("google-chrome");
 #else
   *result = cache_dir.Append("chromium");
@@ skipping 25 matching lines @@
 
   return true;
 }
 
 bool GetUserDesktop(FilePath* result) {
   *result = GetXDGUserDirectory("DESKTOP", "Desktop");
   return true;
 }
 
 }  // namespace chrome