Add user script support to extensions.

chrome/browser/profile.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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lock.h"
@@ skipping 239 matching lines @@
     profile_->ReinitializeSpellChecker();
   }
 
   virtual SpellChecker* GetSpellChecker() {
     return profile_->GetSpellChecker();
   }
 
   virtual void MarkAsCleanShutdown() {
   }
 
+  virtual void InitExtensions() {
+    NOTREACHED();
+  }
+
   virtual void ExitedOffTheRecordMode() {
     // Drop our download manager so we forget about all the downloads made
     // in off-the-record mode.
     download_manager_ = NULL;
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     DCHECK_EQ(NOTIFY_BROWSER_CLOSED, type);
@@ skipping 20 matching lines @@
 
   // Time we were started.
   Time start_time_;
 
   DISALLOW_EVIL_CONSTRUCTORS(OffTheRecordProfileImpl);
 };
 
 ProfileImpl::ProfileImpl(const std::wstring& path)
     : path_(path),
       off_the_record_(false),
-      extensions_service_(new ExtensionsService(FilePath(path))),
       history_service_created_(false),
       created_web_data_service_(false),
       created_download_manager_(false),
       request_context_(NULL),
       start_time_(Time::Now()),
       spellchecker_(NULL),
 #ifdef CHROME_PERSONALIZATION
       personalization_(NULL),
 #endif
       shutdown_session_service_(false) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
+
   PrefService* prefs = GetPrefs();
   prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this);
   prefs->AddPrefObserver(prefs::kEnableSpellCheck, this);
+
+  InitExtensions();
+}
+
+void ProfileImpl::InitExtensions() {
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  bool user_scripts_enabled =
+      command_line->HasSwitch(switches::kEnableUserScripts);
+  bool extensions_enabled = 
+      command_line->HasSwitch(switches::kEnableExtensions);
+
+  std::wstring script_dir;
+  if (user_scripts_enabled) {
+    script_dir = GetPath();
+    file_util::AppendToPath(&script_dir, chrome::kUserScriptsDirname);
+  }
+
+  user_script_master_ = new UserScriptMaster(
+      g_browser_process->file_thread()->message_loop(), FilePath(script_dir));
+  extensions_service_ = new ExtensionsService(
+      FilePath(GetPath()), user_script_master_.get());
+
+  // If we have extensions, the extension service will kick off the first scan
+  // after extensions are loaded. Otherwise, we need to do that now.
+  if (extensions_enabled)
+    extensions_service_->Init();
+  else if (user_scripts_enabled)
+    user_script_master_->StartScan();
 }
 
 ProfileImpl::~ProfileImpl() {
   tab_restore_service_ = NULL;
 
   StopCreateSessionServiceTimer();
   // TemplateURLModel schedules a task on the WebDataService from its
   // destructor. Delete it first to ensure the task gets scheduled before we
   // shut down the database.
   template_url_model_.reset();
@@ skipping 113 matching lines @@
   }
 
   return visited_link_master_.get();
 }
 
 ExtensionsService* ProfileImpl::GetExtensionsService() {
   return extensions_service_.get();
 }
 
 UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
-  if (!user_script_master_.get()) {
-    std::wstring script_dir = GetPath();
-    file_util::AppendToPath(&script_dir, chrome::kUserScriptsDirname);
-    user_script_master_ =
-        new UserScriptMaster(g_browser_process->file_thread()->message_loop(),
-                             FilePath(script_dir));
-  }
-
   return user_script_master_.get();
 }
 
 PrefService* ProfileImpl::GetPrefs() {
   if (!prefs_.get()) {
     prefs_.reset(new PrefService(GetPrefFilePath()));
 
     // The Profile class and ProfileManager class may read some prefs so
     // register known prefs as soon as possible.
     Profile::RegisterUserPrefs(prefs_.get());
@@ skipping 288 matching lines @@
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   if (!personalization_.get())
     personalization_.reset(
         Personalization::CreateProfilePersonalization(this));
   return personalization_.get();
 }
 #endif