diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 04:30:12 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 04:30:12 +0000 |
| commit | 919ddc8c4928d69c3db02c68c0dbf573ebc54899 (patch) | |
| tree | 74d8d509008427576fddfcf01282b897df23d261 /chrome/browser/profile.cc | |
| parent | 6f317586c5b00ab2196d9f3dbff571bad34b8352 (diff) | |
| download | chromium_src-919ddc8c4928d69c3db02c68c0dbf573ebc54899.zip chromium_src-919ddc8c4928d69c3db02c68c0dbf573ebc54899.tar.gz chromium_src-919ddc8c4928d69c3db02c68c0dbf573ebc54899.tar.bz2 | |
Various minor fixes:
* --load-extension no longer requires --enable-extensions
* No longer support chrome:// URLs for user scripts
* Remove old unused Greasemonkey test
* Enable Greasemonkey API emulation in linux/mac
BUG=16720,16007,4476
TEST=Added several unit tests
Original review:
http://codereview.chromium.org/149619
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20719 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 46ba216..72bf157 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -563,6 +563,18 @@ void ProfileImpl::InitExtensions() { false); extensions_service_->Init(); + + // Load any extensions specified with --load-extension. + if (command_line->HasSwitch(switches::kLoadExtension)) { + std::wstring path_string = + command_line->GetSwitchValue(switches::kLoadExtension); + FilePath path = FilePath::FromWStringHack(path_string); + extensions_service_->LoadExtension(path); + + // Tell UserScriptMaser to watch this extension's directory for changes so + // you can live edit content scripts during development. + user_script_master_->AddWatchedPath(path); + } } void ProfileImpl::InitWebResources() { |