Allow Flash (and other plugins) to be installed without restarting the browse...

base/registry.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.
 // All Rights Reserved.
 
 #include "base/registry.h"
 
 #include <assert.h>
 #include <shlwapi.h>
 #include <windows.h>
@@ skipping 333 matching lines @@
 }
 
 
 bool RegKey::DeleteValue(const tchar * value_name) {
   assert(value_name);
   HRESULT const result = RegDeleteValue(key_, value_name);
   return (result == ERROR_SUCCESS);
 }
 
 bool RegKey::StartWatching() {
-  assert(watch_event_ == 0);
-  watch_event_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (!watch_event_)
+    watch_event_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+
   DWORD filter = REG_NOTIFY_CHANGE_NAME |
                  REG_NOTIFY_CHANGE_ATTRIBUTES |
                  REG_NOTIFY_CHANGE_LAST_SET |
                  REG_NOTIFY_CHANGE_SECURITY;
 
   // Watch the registry key for a change of value.
   HRESULT result = RegNotifyChangeKeyValue(key_, TRUE, filter,
                                            watch_event_, TRUE);
   if (SUCCEEDED(result)) {
     return true;
   } else {
     CloseHandle(watch_event_);
     watch_event_ = 0;
     return false;
   }
 }
 
 bool RegKey::StopWatching() {
   if (watch_event_) {
     CloseHandle(watch_event_);
     watch_event_ = 0;
     return true;
   }
   return false;
 }
 
 bool RegKey::HasChanged() {
   if (watch_event_) {
     if (WaitForSingleObject(watch_event_, 0) == WAIT_OBJECT_0) {
-      // An event only gets signaled once, then it's done, so we have
-      // to set up another event to watch.
-      CloseHandle(watch_event_);
-      watch_event_ = 0;
       StartWatching();
       return true;
     }
   }
   return false;
 }
 
 // Register a COM object with the most usual properties.
 bool RegisterCOMServer(const tchar* guid,
                        const tchar* name,
@@ skipping 12 matching lines @@
   ::GetModuleFileName(module, module_path, MAX_PATH);
   _tcslwr_s(module_path, MAX_PATH);
   return RegisterCOMServer(guid, name, module_path);
 }
 
 bool UnregisterCOMServer(const tchar* guid) {
   RegKey key(HKEY_CLASSES_ROOT, _T("CLSID"), KEY_WRITE);
   key.DeleteKey(guid);
   return true;
 }