Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome...

chrome_frame/registry_watcher.h

+// Copyright (c) 2011 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.
+//
+// A utility class that makes it easy to register for registry change
+// notifications.
+//
+
+#ifndef CHROME_FRAME_REGISTRY_WATCHER_H_
+#define CHROME_FRAME_REGISTRY_WATCHER_H_
+
+#include <windows.h>
+
+class RegistryWatcher {
+ public:
+  RegistryWatcher(HKEY hive, const wchar_t* path, WAITORTIMERCALLBACK callback);

[grt (UTC plus 2), 2011/05/26 17:08:58]

Change this so that users of this class don't need this boilerplate:
  RegistryWatcher* watcher = reinterpret_cast<RegistryWatcher*>(param);
  if (watcher->stopping())
    return;
One way would be to add a private static func that is used for the
WAITORTIMERCALLBACK internally.  This func would do the cast and delegate to the
user's callback func iff !stopping.

[robertshield, 2011/05/27 03:34:59]

Done.

+  ~RegistryWatcher();
+
+  bool StartWatching();
+  void StopWatching();
+
+  bool stopping() { return stopping_; }
+
+ private:
+  HKEY registry_key_;
+
+  HANDLE wait_event_;
+  HANDLE wait_handle_;
+  bool stopping_;
+
+  WAITORTIMERCALLBACK callback_;
+};
+
+
+#endif  // CHROME_FRAME_REGISTRY_WATCHER_H_