Add the chromeframe tag to the user agent header at runtime instead of static...

chrome_frame/chrome_tab.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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
+
+// Include without path to make GYP build see it.
+#include "chrome_tab.h"  // NOLINT
+
+#include <atlsecurity.h>
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/chrome_frame_resources.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/chrome_frame_reporting.h"
 #include "chrome_frame/chrome_launcher.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/utils.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-#include <atlsecurity.h>
-
 static const wchar_t kBhoRegistryPath[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"
     L"\\Browser Helper Objects";
 
 const wchar_t kInternetSettings[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
 
 const wchar_t kBhoNoLoadExplorerValue[] = L"NoExplorer";
 
 class ChromeTabModule
@@ skipping 101 matching lines @@
 #ifdef _MANAGED
 #pragma managed(pop)
 #endif
 
 const wchar_t kPostPlatformUAKey[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\"
     L"User Agent\\Post Platform";
 const wchar_t kClockUserAgent[] = L"chromeframe";
 
 // To delete the clock user agent, set value to NULL.
+// TODO(tommi): Remove this method when it's no longer used.
 HRESULT SetClockUserAgent(const wchar_t* value) {
   HRESULT hr;
   RegKey ua_key;
   if (ua_key.Create(HKEY_LOCAL_MACHINE, kPostPlatformUAKey, KEY_WRITE)) {
     if (value) {
       ua_key.WriteValue(kClockUserAgent, value);
     } else {
       ua_key.DeleteValue(kClockUserAgent);
     }
     hr = S_OK;
@@ skipping 46 matching lines @@
   if (!ie_bho_key.CreateKey(bho_class_id_as_string, KEY_READ | KEY_WRITE)) {
     DLOG(WARNING) << "Failed to create bho registry key under "
                   << kBhoRegistryPath
                   << " for write";
     return E_FAIL;
   }
 
   ie_bho_key.WriteValue(kBhoNoLoadExplorerValue, 1);
   DLOG(INFO) << "Registered ChromeTab BHO";
 
-  SetClockUserAgent(L"1");
+  // We now add the chromeframe user agent at runtime.
+  // SetClockUserAgent(L"1");
   RefreshElevationPolicy();
   return S_OK;
 }
 
 HRESULT UnregisterChromeTabBHO() {
+  // TODO(tommi): remove this in future versions.
   SetClockUserAgent(NULL);
 
   RegKey ie_bho_key;
   if (!ie_bho_key.Open(HKEY_LOCAL_MACHINE, kBhoRegistryPath,
                        KEY_READ | KEY_WRITE)) {
     DLOG(WARNING) << "Failed to open registry key "
                   << kBhoRegistryPath
                   << " for write.";
     return E_FAIL;
   }
@@ skipping 253 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }