Use Ash's ShelfWindowWatcher for app panel windows.

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/aura/wm_window_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/panels/panel_frame_view.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_observer.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/screen_util.h"
 #include "ash/shared/app_types.h"
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "chrome/browser/chromeos/note_taking_app_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
+#include "chrome/browser/ui/ash/property_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 77 matching lines @@
 
   // Not owned.
   AppWindow* app_window_;
   ash::wm::WindowState* window_state_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowStateDelegate);
 };
 
 }  // namespace
 
-ChromeNativeAppWindowViewsAuraAsh::ChromeNativeAppWindowViewsAuraAsh() {
-}
+ChromeNativeAppWindowViewsAuraAsh::ChromeNativeAppWindowViewsAuraAsh() {}
 
-ChromeNativeAppWindowViewsAuraAsh::~ChromeNativeAppWindowViewsAuraAsh() {
-}
+ChromeNativeAppWindowViewsAuraAsh::~ChromeNativeAppWindowViewsAuraAsh() {}
 
 void ChromeNativeAppWindowViewsAuraAsh::InitializeWindow(
     AppWindow* app_window,
     const AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViewsAura::InitializeWindow(app_window, create_params);
+  aura::Window* window = widget()->GetNativeWindow();
   // Restore docked state on ash desktop.
-  if (create_params.state == ui::SHOW_STATE_DOCKED) {
-    widget()->GetNativeWindow()->SetProperty(aura::client::kShowStateKey,
-                                             create_params.state);
-  }
+  if (create_params.state == ui::SHOW_STATE_DOCKED)
+    window->SetProperty(aura::client::kShowStateKey, create_params.state);
+  window->SetProperty(aura::client::kAppIdKey,
+                      new std::string(app_window->extension_id()));
 
-  if (!app_window->window_type_is_panel()) {
+  if (app_window->window_type_is_panel()) {
+    // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
+    property_util::SetIntProperty(window, ash::kShelfItemTypeKey,
+                                  ash::TYPE_APP_PANEL);
+  } else {
     ash::AppType app_type = ash::AppType::CHROME_APP;
     Profile* profile =
         Profile::FromBrowserContext(app_window->browser_context());
     if (profile && chromeos::IsNoteTakingAppWindow(app_window, profile))
       app_type = ash::AppType::DEFAULT_NOTE_TAKING_APP;
-    widget()->GetNativeWindow()->SetProperty(aura::client::kAppType,
-                                             static_cast<int>(app_type));
+    window->SetProperty(aura::client::kAppType, static_cast<int>(app_type));
   }
 }
 
 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) {
-    // Puts ime windows into ime window container.
+    // Puts ime windows into the ime window container.
     init_params->parent =
         ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                  ash::kShellWindowId_ImeWindowParentContainer);
   }
   init_params->mus_properties
       [ui::mojom::WindowManager::kRemoveStandardFrame_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(init_params->remove_standard_frame);
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
     bool use_default_bounds,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(use_default_bounds,
                                                           init_params,
                                                           widget);
 
   if (ash::Shell::HasInstance() && use_default_bounds) {
     // Open a new panel on the target root.
+    init_params->context = ash::Shell::GetTargetRootWindow();
     init_params->bounds = ash::ScreenUtil::ConvertRectToScreen(
         ash::Shell::GetTargetRootWindow(), gfx::Rect(GetPreferredSize()));
   }
 }
 
 views::NonClientFrameView*
 ChromeNativeAppWindowViewsAuraAsh::CreateNonStandardAppFrame() {
   apps::AppWindowFrameView* frame = new apps::AppWindowFrameView(widget(), this,
       HasFrameColor(), ActiveFrameColor(), InactiveFrameColor());
   frame->Init();
@@ skipping 173 matching lines @@
     GetMusWindow(widget()->GetNativeWindow())
         ->SetClientArea(insets, std::move(additional_client_regions));
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
 }