summaryrefslogtreecommitdiffstats
path: root/extensions/browser
diff options
context:
space:
mode:
authorcylee <cylee@chromium.org>2014-12-01 11:03:39 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-01 19:04:31 +0000
commit49e02a96d9be53d4358e053565571542dd256bcf (patch)
tree5e9d8142cce21827ee1859ecfdd0601f7cbb736a /extensions/browser
parentc391abd80fad4dedfe89d5b18aa5748b0b1b92fa (diff)
downloadchromium_src-49e02a96d9be53d4358e053565571542dd256bcf.zip
chromium_src-49e02a96d9be53d4358e053565571542dd256bcf.tar.gz
chromium_src-49e02a96d9be53d4358e053565571542dd256bcf.tar.bz2
Resubmit https://codereview.chromium.org/722703002/ because of build
breakage. Make "source" a required argument of AppLaunchParams and fill in the argument in all call points. This reverts commit bad38cd9f3199784a10cdb99de9184c9055bef28. BUG=400619 Review URL: https://codereview.chromium.org/752143002 Cr-Commit-Position: refs/heads/master@{#306222}
Diffstat (limited to 'extensions/browser')
-rw-r--r--extensions/browser/api/app_runtime/app_runtime_api.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/extensions/browser/api/app_runtime/app_runtime_api.cc b/extensions/browser/api/app_runtime/app_runtime_api.cc
index 13ac1be..6cb7c71 100644
--- a/extensions/browser/api/app_runtime/app_runtime_api.cc
+++ b/extensions/browser/api/app_runtime/app_runtime_api.cc
@@ -83,13 +83,24 @@ app_runtime::LaunchSource getLaunchSourceEnum(
return app_runtime::LAUNCH_SOURCE_FILE_HANDLER;
case extensions::SOURCE_URL_HANDLER:
return app_runtime::LAUNCH_SOURCE_URL_HANDLER;
-
case extensions::SOURCE_SYSTEM_TRAY:
return app_runtime::LAUNCH_SOURCE_SYSTEM_TRAY;
case extensions::SOURCE_ABOUT_PAGE:
return app_runtime::LAUNCH_SOURCE_ABOUT_PAGE;
case extensions::SOURCE_KEYBOARD:
return app_runtime::LAUNCH_SOURCE_KEYBOARD;
+ case extensions::SOURCE_EXTENSIONS_PAGE:
+ return app_runtime::LAUNCH_SOURCE_EXTENSIONS_PAGE;
+ case extensions::SOURCE_MANAGEMENT_API:
+ return app_runtime::LAUNCH_SOURCE_MANAGEMENT_API;
+ case extensions::SOURCE_EPHEMERAL_APP:
+ return app_runtime::LAUNCH_SOURCE_EPHEMERAL_APP;
+ case extensions::SOURCE_BACKGROUND:
+ return app_runtime::LAUNCH_SOURCE_BACKGROUND;
+ case extensions::SOURCE_KIOSK:
+ return app_runtime::LAUNCH_SOURCE_KIOSK;
+ case extensions::SOURCE_CHROME_INTERNAL:
+ return app_runtime::LAUNCH_SOURCE_CHROME_INTERNAL;
default:
return app_runtime::LAUNCH_SOURCE_NONE;