| Index: apps/app_load_service.cc
|
| diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc
|
| index fe224c5e8ebf7b64a0d2a419ca001be383bc6eaf..9e7c06302ffb321d59910bcc42fd031b500fc4ff 100644
|
| --- a/apps/app_load_service.cc
|
| +++ b/apps/app_load_service.cc
|
| @@ -28,8 +28,7 @@ using extensions::ExtensionSystem;
|
| namespace apps {
|
|
|
| AppLoadService::PostReloadAction::PostReloadAction()
|
| - : action_type(LAUNCH),
|
| - command_line(CommandLine::NO_PROGRAM) {
|
| + : action_type(RELOAD), command_line(CommandLine::NO_PROGRAM) {
|
| }
|
|
|
| AppLoadService::AppLoadService(Profile* profile)
|
| @@ -71,7 +70,7 @@ bool AppLoadService::LoadAndLaunch(const base::FilePath& extension_path,
|
|
|
| // Schedule the app to be launched once loaded.
|
| PostReloadAction& action = post_reload_actions_[extension_id];
|
| - action.action_type = LAUNCH_WITH_COMMAND_LINE;
|
| + action.action_type = LOAD_AND_LAUNCH;
|
| action.command_line = command_line;
|
| action.current_dir = current_dir;
|
| return true;
|
| @@ -98,15 +97,18 @@ void AppLoadService::Observe(int type,
|
| return;
|
|
|
| switch (it->second.action_type) {
|
| - case LAUNCH:
|
| - LaunchPlatformApp(profile_, extension);
|
| + case RELOAD:
|
| + LaunchPlatformApp(profile_, extension, extensions::SOURCE_RELOAD);
|
| break;
|
| case RESTART:
|
| RestartPlatformApp(profile_, extension);
|
| break;
|
| - case LAUNCH_WITH_COMMAND_LINE:
|
| - LaunchPlatformAppWithCommandLine(
|
| - profile_, extension, it->second.command_line, it->second.current_dir);
|
| + case LOAD_AND_LAUNCH:
|
| + LaunchPlatformAppWithCommandLine(profile_,
|
| + extension,
|
| + it->second.command_line,
|
| + it->second.current_dir,
|
| + extensions::SOURCE_LOAD_AND_LAUNCH);
|
| break;
|
| default:
|
| NOTREACHED();
|
| @@ -127,7 +129,7 @@ void AppLoadService::OnExtensionUnloaded(
|
| if (WasUnloadedForReload(extension->id(), reason) &&
|
| extension_prefs->IsActive(extension->id()) &&
|
| !HasPostReloadAction(extension->id())) {
|
| - post_reload_actions_[extension->id()].action_type = LAUNCH;
|
| + post_reload_actions_[extension->id()].action_type = RELOAD;
|
| }
|
| }
|
|
|
|
|