Changes in app.window and app.runtime to support lock screen note taking

extensions/browser/api/app_window/app_window_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/app_window/app_window_api.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_client.h"
 #include "extensions/browser/app_window/app_window_contents.h"
 #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"
 #include "extensions/common/manifest.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/geometry/rect.h"
 #include "url/gurl.h"
@@ skipping 309 matching lines @@
         case app_window::STATE_MAXIMIZED:
           create_params.state = ui::SHOW_STATE_MAXIMIZED;
           break;
         case app_window::STATE_MINIMIZED:
           create_params.state = ui::SHOW_STATE_MINIMIZED;
           break;
       }
     }
   }
 
+  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."));
+    }
+
+    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());
+      action_type != api::app_runtime::ACTION_TYPE_NONE

[benwells, 2017/06/13 10:30:46]

This ternary is a bit out of control. I think it would be more readable as an if
/ else.

[tbarzic, 2017/06/13 19:17:59]

Done.

+          ? AppWindowClient::Get()->CreateAppWindowForLockScreenAction(
+                browser_context(), extension(), action_type)
+          : AppWindowClient::Get()->CreateAppWindow(browser_context(),
+                                                    extension());
+
+  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);
 
   if (ExtensionsBrowserClient::Get()->IsRunningInForcedAppMode() &&
       !app_window->is_ime_window()) {
     app_window->ForcedFullscreen();
   }
 
   content::RenderFrameHost* created_frame =
       app_window->web_contents()->GetMainFrame();
@@ skipping 196 matching lines @@
 
   if (options.frame->as_frame_options->inactive_color.get()) {
     *error = app_window_constants::kInactiveColorWithoutColor;
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions