diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 00:49:27 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 00:49:27 +0000 |
| commit | 9197f3b97b9f4c0a2170679675f8c0e0a64e7641 (patch) | |
| tree | 06e2906c4f536997499ac10d9e6f1b40f5f9eb49 /chrome/browser/profile.cc | |
| parent | 62e22cbfe72cf7d6784210516928ed445880b158 (diff) | |
| download | chromium_src-9197f3b97b9f4c0a2170679675f8c0e0a64e7641.zip chromium_src-9197f3b97b9f4c0a2170679675f8c0e0a64e7641.tar.gz chromium_src-9197f3b97b9f4c0a2170679675f8c0e0a64e7641.tar.bz2 | |
The extensions service wasn't getting inited despite being used by themes (this manifested itself as theme reinstall failing, because CheckCurrentVersion found the directory, but ExtensionService::extensions_ was empty).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115974
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index e5d007e..6269d36 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -431,9 +431,6 @@ void ProfileImpl::InitExtensions() { bool user_scripts_enabled = command_line->HasSwitch(switches::kEnableUserScripts) || prefs->GetBoolean(prefs::kEnableUserScripts); - bool extensions_enabled = - command_line->HasSwitch(switches::kEnableExtensions) || - prefs->GetBoolean(prefs::kEnableExtensions); FilePath script_dir; if (user_scripts_enabled) { @@ -449,18 +446,14 @@ void ProfileImpl::InitExtensions() { ExtensionErrorReporter::Init(true); // allow noisy errors. user_script_master_ = new UserScriptMaster( - g_browser_process->file_thread()->message_loop(), script_dir); + g_browser_process->file_thread()->message_loop(), + script_dir); extensions_service_ = new ExtensionsService( this, MessageLoop::current(), g_browser_process->file_thread()->message_loop(), std::string()); // Use default registry path - // 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(); + extensions_service_->Init(); } ProfileImpl::~ProfileImpl() { |