summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:49:02 +0000
committerandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:49:02 +0000
commitccd875e758bbec05869f3ad4ba6122a624742295 (patch)
tree85712b9688a7283f0875b40db51d0703a6151eee /chrome/browser/browser_main.cc
parentbef12f40253f48b56a69e59746f52214727080de (diff)
downloadchromium_src-ccd875e758bbec05869f3ad4ba6122a624742295.zip
chromium_src-ccd875e758bbec05869f3ad4ba6122a624742295.tar.gz
chromium_src-ccd875e758bbec05869f3ad4ba6122a624742295.tar.bz2
Fix extension packer command-line code for Mac. Instead of blocking in a janky way by running the message loop, I added an option to run the extension packer job synchronously.
One thing to note as it pertains to the bug report is that the path must be fully qualified. ~/ for home directories doesn't work for me. BUG=65645 TEST=none Review URL: http://codereview.chromium.org/5703004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 23d7ad6..103e5be 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1277,8 +1277,12 @@ int BrowserMain(const MainFunctionParams& parameters) {
// If the command line specifies --pack-extension, attempt the pack extension
// startup action and exit.
if (parsed_command_line.HasSwitch(switches::kPackExtension)) {
- extensions_startup::HandlePackExtension(parsed_command_line);
- return ResultCodes::NORMAL_EXIT;
+ ExtensionsStartupUtil extension_startup_util;
+ if (extension_startup_util.PackExtension(parsed_command_line)) {
+ return ResultCodes::NORMAL_EXIT;
+ } else {
+ return ResultCodes::PACK_EXTENSION_ERROR;
+ }
}
#if !defined(OS_MACOSX)
@@ -1573,8 +1577,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
// specifies --uninstall-extension, attempt the uninstall extension startup
// action.
if (parsed_command_line.HasSwitch(switches::kUninstallExtension)) {
- if (extensions_startup::HandleUninstallExtension(parsed_command_line,
- profile)) {
+ ExtensionsStartupUtil ext_startup_util;
+ if (ext_startup_util.UninstallExtension(parsed_command_line, profile)) {
return ResultCodes::NORMAL_EXIT;
} else {
return ResultCodes::UNINSTALL_EXTENSION_ERROR;