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

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

 // Copyright 2016 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 "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/frame/custom_frame_view_ash.h"
@@ skipping 128 matching lines @@
                         static_cast<int>(ash::AppType::CHROME_APP));
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnBeforeWidgetInit(
     const AppWindow::CreateParams& create_params,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   ChromeNativeAppWindowViewsAura::OnBeforeWidgetInit(create_params, init_params,
                                                      widget);
-  if (create_params.is_ime_window) {
-    // Put ime windows into the ime window container on the primary display.
-    int container_id = ash::kShellWindowId_ImeWindowParentContainer;
+  if (create_params.is_ime_window || create_params.show_on_lock_screen) {
+    // Put ime windows and lock screen windows into their respective  window

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

Nit: two spaces after respective

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

Done.

+    // containers on the primary display.
+    int container_id = create_params.is_ime_window
+                           ? ash::kShellWindowId_ImeWindowParentContainer
+                           : ash::kShellWindowId_LockActionHandlerContainer;
     if (ash_util::IsRunningInMash()) {
       init_params->mus_properties
           [ui::mojom::WindowManager::kContainerId_InitProperty] =
           mojo::ConvertTo<std::vector<uint8_t>>(container_id);
       int display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
       init_params
           ->mus_properties[ui::mojom::WindowManager::kDisplayId_InitProperty] =
           mojo::ConvertTo<std::vector<uint8_t>>(display_id);
     } else {
       init_params->parent = ash::Shell::GetContainer(
@@ skipping 211 matching lines @@
     bool activate_on_pointer) {
   widget()->GetNativeWindow()->SetProperty(aura::client::kActivateOnPointerKey,
                                            activate_on_pointer);
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
 }