Add support for almost-recursive watches in Linux DirectoryWatcher

chrome/browser/extensions/user_script_master.cc

 // Copyright (c) 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 "chrome/browser/extensions/user_script_master.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "base/thread.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
 
 
 // Helper function to parse greasesmonkey headers
 static bool GetDeclarationValue(const StringPiece& line,
                                 const StringPiece& prefix,
                                 std::string* value) {
   if (!line.starts_with(prefix))
@@ skipping 236 matching lines @@
   if (script_reloader_)
     script_reloader_->DisownMaster();
 
 // TODO(aa): Enable this when DirectoryWatcher is implemented for linux.
 #if defined(OS_WIN) || defined(OS_MACOSX)
   STLDeleteElements(&dir_watchers_);
 #endif
 }
 
 void UserScriptMaster::AddWatchedPath(const FilePath& path) {
 // TODO(aa): Enable this when DirectoryWatcher is implemented for linux.

[Evan Martin, 2009/05/14 17:48:28]

I guess this TODO can be fixed now!  Maybe in a differnt CL if you prefer.

 #if defined(OS_WIN) || defined(OS_MACOSX)
   DirectoryWatcher* watcher = new DirectoryWatcher();
-  watcher->Watch(path, this, true);
+  base::Thread* file_thread = g_browser_process->file_thread();
+  watcher->Watch(path, this, file_thread ? file_thread->message_loop() : NULL,
+                 true);
   dir_watchers_.push_back(watcher);
 #endif
 }
 
 void UserScriptMaster::NewScriptsAvailable(base::SharedMemory* handle) {
   // Ensure handle is deleted or released.
   scoped_ptr<base::SharedMemory> handle_deleter(handle);
 
   if (pending_scan_) {
     // While we were scanning, there were further changes.  Don't bother
@@ skipping 23 matching lines @@
 
   StartScan();
 }
 
 void UserScriptMaster::StartScan() {
   if (!script_reloader_)
     script_reloader_ = new ScriptReloader(this);
 
   script_reloader_->StartScan(worker_loop_, user_script_dir_, lone_scripts_);
 }