Chromium Code Reviews| Index: extensions/shell/browser/default_shell_browser_main_delegate.cc |
| diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc |
| index 491fe4370324a1e5d70243477782fd304cf63a61..7e49f52e41184bbcac078f9b3e1dbd31dcc29688 100644 |
| --- a/extensions/shell/browser/default_shell_browser_main_delegate.cc |
| +++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc |
| @@ -7,6 +7,7 @@ |
| #include "base/command_line.h" |
| #include "base/files/file_path.h" |
| #include "base/files/file_util.h" |
| +#include "base/strings/string_tokenizer.h" |
| #include "extensions/shell/browser/shell_desktop_controller.h" |
| #include "extensions/shell/browser/shell_extension_system.h" |
| #include "extensions/shell/common/switches.h" |
| @@ -23,15 +24,25 @@ void DefaultShellBrowserMainDelegate::Start( |
| content::BrowserContext* browser_context) { |
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| if (command_line->HasSwitch(switches::kAppShellAppPath)) { |
| - base::FilePath app_dir( |
| - command_line->GetSwitchValueNative(switches::kAppShellAppPath)); |
| - base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir); |
| - |
| ShellExtensionSystem* extension_system = static_cast<ShellExtensionSystem*>( |
| ExtensionSystem::Get(browser_context)); |
| - if (!extension_system->LoadApp(app_absolute_dir)) |
| - return; |
| - extension_system->LaunchApp(); |
| + extension_system->Init(); |
| + |
| + CommandLine::StringType path_list = |
|
James Cook
2014/10/24 00:26:49
btw, it's nice that you used StringType here... yo
|
| + command_line->GetSwitchValueNative(switches::kAppShellAppPath); |
| + |
| + base::StringTokenizerT<CommandLine::StringType, |
| + CommandLine::StringType::const_iterator> |
| + tokenizer(path_list, FILE_PATH_LITERAL(",")); |
| + while (tokenizer.GetNext()) { |
| + base::FilePath app_absolute_dir = |
| + base::MakeAbsoluteFilePath(base::FilePath(tokenizer.token())); |
| + |
| + const Extension* extension = extension_system->LoadApp(app_absolute_dir); |
| + if (!extension) |
| + continue; |
| + extension_system->LaunchApp(extension->id()); |
| + } |
| } else { |
| LOG(ERROR) << "--" << switches::kAppShellAppPath |
| << " unset; boredom is in your future"; |