Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: extensions/browser/api/app_window/app_window_api.cc

Issue 2934513003: Changes in app.window and app.runtime to support lock screen note taking (Closed)
Patch Set: . Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..13d2ba86cf8f9a0cbfbe77747be58cdaa5189138 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,39 @@ 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)) {
Devlin 2017/06/14 19:13:47 nit: wrapping parens unnecessary.
tbarzic 2017/06/14 19:48:48 Done.
+ if (source_context_type() != Feature::LOCK_SCREEN_EXTENSION_CONTEXT) {
+ return RespondNow(Error(
+ "The lockScreenAction option requires lock screen app context."));
+ }
+
+ 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);
+ }
+
+ if (!app_window)
Devlin 2017/06/14 19:13:47 document when this can happen?
tbarzic 2017/06/14 19:48:48 Done.
+ return RespondNow(Error("Failed to create the app window."));
+
app_window->Init(url, new AppWindowContentsImpl(app_window),
render_frame_host(), create_params);

Powered by Google App Engine
This is Rietveld 408576698