Continue to remove CHROME_FRAME_BUILD define from code that goes into chrome....

chrome/app/client_util.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 <windows.h>
 #include <shlwapi.h>
 
 #include "chrome/app/breakpad_win.h"
 #include "chrome/app/client_util.h"
 #include "chrome/common/result_codes.h"
+#include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*, wchar_t*);
 
 // Not generic, we only handle strings up to 128 chars.
 bool ReadRegistryStr(HKEY key, const wchar_t* name, std::wstring* value) {
@@ skipping 147 matching lines @@
 
   return entry_point(instance, sbox_info, ::GetCommandLineW());
 }
 
 //=============================================================================
 
 class ChromeDllLoader : public MainDllLoader {
  public:
   virtual std::wstring GetRegistryPath() {
     std::wstring key(google_update::kRegPathClients);
     key.append(L"\\").append(google_update::kChromeGuid);

[kuchhal, 2009/11/04 20:55:08]

You probably need to change this too, to pick up CF GUID?

[robertshield, 2009/11/04 22:15:39]

kChromeGuid is defined in a generated header that is specified at build time.
This will need to be updated, so that it can be given on the command line too,
but I am going to do that in a different patch. Thanks!

     return key;
   }
 
   virtual void OnBeforeLaunch(const std::wstring& version) {
     RecordDidRun(google_update::kChromeGuid);
   }
 };
 
 //=============================================================================
 
 class ChromiumDllLoader : public MainDllLoader {
  public:
   virtual std::wstring GetRegistryPath() {
-    return L"Software\\Chromium";
+    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+    return dist->GetVersionKey();
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }