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

chrome/installer/util/shell_util.cc

 // Copyright (c) 2009 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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 295 matching lines @@
   }
   if (file_util::PathExists(FilePath::FromWStringHack(exe_path))) {
     std::wstring params(L"--");
     params.append(installer_util::switches::kRegisterChromeBrowser);
     params.append(L"=\"" + chrome_exe + L"\"");
     if (!suffix.empty()) {
       params.append(L" --");
       params.append(installer_util::switches::kRegisterChromeBrowserSuffix);
       params.append(L"=\"" + suffix + L"\"");
     }
+
+    CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+    if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
+      params.append(L" --");
+      params.append(installer_util::switches::kChromeFrame);
+    }
+
     DWORD ret_val = 0;
     InstallUtil::ExecuteExeAsAdmin(exe_path, params, &ret_val);
     if (ret_val == 0)
       return true;
   }
   return false;
 }
 
 // This method tries to figure out if another user has already registered her
 // own copy of Chrome so that we can avoid overwriting it and append current
@@ skipping 445 matching lines @@
   } else {
     return file_util::UpdateShortcutLink(chrome_exe.c_str(),      // target
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
                                          description.c_str(),     // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }
 }