diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 09:22:44 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 09:22:44 +0000 |
| commit | f08a247c471a213f294e6d368030ac7d11e34c28 (patch) | |
| tree | 5f3f0166f409fce701d404420bcd42af07ccd95f /chrome/browser/browser_init.cc | |
| parent | fe353520ea60183a44c4e8374ab21687df7744c1 (diff) | |
| download | chromium_src-f08a247c471a213f294e6d368030ac7d11e34c28.zip chromium_src-f08a247c471a213f294e6d368030ac7d11e34c28.tar.gz chromium_src-f08a247c471a213f294e6d368030ac7d11e34c28.tar.bz2 | |
Remove extraneous uses of the --enable-user-script
switch. It's better to check this at one chokepoint
(initialization) and let the rest of the code work
the same, but end up as no-ops.
Review URL: http://codereview.chromium.org/18401
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 637f129..ce4febe 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -222,8 +222,6 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, } } - profile->InitExtensions(); - return true; } @@ -385,6 +383,10 @@ bool BrowserInit::ProcessCommandLine(const CommandLine& parsed_command_line, CreateAutomationProvider<AutomationProvider>(automation_channel_id, profile, expected_tabs); } + + // Start up the extensions service. + profile->InitExtensions(); + // If we don't want to launch a new browser window or tab (in the case // of an automation request), we are done here. if (!silent_launch) { |