Chromium Code Reviews| Index: extensions/browser/api/app_window/app_window_api.cc |
| diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc |
| index 0edbaef231864c172fec63d8dd6884efc01bd591..3caeff11b0e2057b8dfaf6395f652a7206af0966 100644 |
| --- a/extensions/browser/api/app_window/app_window_api.cc |
| +++ b/extensions/browser/api/app_window/app_window_api.cc |
| @@ -27,6 +27,7 @@ |
| #include "extensions/browser/app_window/app_window_registry.h" |
| #include "extensions/browser/app_window/native_app_window.h" |
| #include "extensions/browser/extensions_browser_client.h" |
| +#include "extensions/common/api/app_runtime.h" |
| #include "extensions/common/api/app_window.h" |
| #include "extensions/common/features/simple_feature.h" |
| #include "extensions/common/image_util.h" |
| @@ -356,11 +357,42 @@ ExtensionFunction::ResponseAction AppWindowCreateFunction::Run() { |
| } |
| } |
| + api::app_runtime::ActionType action_type = api::app_runtime::ACTION_TYPE_NONE; |
| + if (options && |
| + options->lock_screen_action != api::app_runtime::ACTION_TYPE_NONE) { |
| + if (source_context_type() != Feature::LOCK_SCREEN_EXTENSION_CONTEXT) { |
| + return RespondNow(Error( |
| + "The lockScreenAction option requires lock screen app context.")); |
|
Devlin
2017/06/20 17:33:13
nit: let's pull this into a const somewhere since
tbarzic
2017/06/20 23:46:49
Done.
|
| + } |
| + |
| + if (!extension()->permissions_data()->HasAPIPermission( |
| + APIPermission::kLockScreen)) { |
| + return RespondNow( |
| + Error("The lockScreenAction option requires lockScreen permission.")); |
| + } |
| + |
| + action_type = options->lock_screen_action; |
| + create_params.show_on_lock_screen = true; |
| + } |
| + |
| create_params.creator_process_id = |
| render_frame_host()->GetProcess()->GetID(); |
| - AppWindow* app_window = |
| - AppWindowClient::Get()->CreateAppWindow(browser_context(), extension()); |
| + AppWindow* app_window = nullptr; |
| + if (action_type == api::app_runtime::ACTION_TYPE_NONE) { |
| + app_window = |
| + AppWindowClient::Get()->CreateAppWindow(browser_context(), extension()); |
| + } else { |
| + app_window = AppWindowClient::Get()->CreateAppWindowForLockScreenAction( |
| + browser_context(), extension(), action_type); |
| + } |
| + |
| + // App window client might refuse to create an app window, e.g. when the app |
| + // attempts to create a lock screen action handler window when the action was |
| + // not requested. |
| + if (!app_window) |
| + return RespondNow(Error("Failed to create the app window.")); |
| + |
| app_window->Init(url, new AppWindowContentsImpl(app_window), |
| render_frame_host(), create_params); |