Add user script support to extensions.

chrome/browser/extensions/extensions_service.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.
 
 #include "chrome/browser/extensions/extensions_service.h"
 
 #include "base/file_util.h"
 #include "base/values.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
 
 // ExtensionsService
 
 const FilePath::CharType* ExtensionsService::kInstallDirectoryName =
     FILE_PATH_LITERAL("Extensions");
 
-ExtensionsService::ExtensionsService(const FilePath& profile_directory)
+ExtensionsService::ExtensionsService(const FilePath& profile_directory,
+                                     UserScriptMaster* user_script_master)
     : message_loop_(MessageLoop::current()),
       backend_(new ExtensionsServiceBackend),
-      install_directory_(profile_directory.Append(kInstallDirectoryName)) {
+      install_directory_(profile_directory.Append(kInstallDirectoryName)),
+      user_script_master_(user_script_master) {
 }
 
 ExtensionsService::~ExtensionsService() {
   for (ExtensionList::iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     delete *iter;
   }
 }
 
 bool ExtensionsService::Init() {
@@ skipping 12 matching lines @@
 
 MessageLoop* ExtensionsService::GetMessageLoop() {
   return message_loop_;
 }
 
 void ExtensionsService::OnExtensionsLoadedFromDirectory(
     ExtensionList* new_extensions) {
   extensions_.insert(extensions_.end(), new_extensions->begin(),
                      new_extensions->end());
 
+  // Tell UserScriptMaster about any scripts in the loaded extensions.
+  for (ExtensionList::iterator extension = extensions_.begin();
+       extension != extensions_.end(); ++extension) {
+    const UserScriptList& scripts = (*extension)->user_scripts();
+    for (UserScriptList::const_iterator script = scripts.begin();
+         script != scripts.end(); ++script) {
+      user_script_master_->AddLoneScript(*script);
+    }
+  }
+
+  // Tell UserScriptMaster to also watch the extensions directory for changes
+  // and then kick off the first scan.
+  // TODO(aa): This should go away when we implement the --extension flag, since
+  // developing scripts in the Extensions directory will no longer be a common
+  // use-case.
+  user_script_master_->AddWatchedPath(install_directory_);
+  user_script_master_->StartScan();
+
   NotificationService::current()->Notify(NOTIFY_EXTENSIONS_LOADED,
       NotificationService::AllSources(),
       Details<ExtensionList>(new_extensions));
 
   delete new_extensions;
 }
 
 void ExtensionsService::OnExtensionLoadError(const std::string& error) {
   // TODO(aa): Print the error message out somewhere better. I think we are
   // going to need some sort of 'extension inspector'.
@@ skipping 66 matching lines @@
       message));
 }
 
 void ExtensionsServiceBackend::ReportExtensionsLoaded(
     ExtensionsServiceFrontendInterface *frontend, ExtensionList* extensions) {
   frontend->GetMessageLoop()->PostTask(FROM_HERE, NewRunnableMethod(
       frontend,
       &ExtensionsServiceFrontendInterface::OnExtensionsLoadedFromDirectory,
       extensions));
 }