mash: Limit ShelfWindowWatcher to panels and dialogs.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.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/ash/launcher/extension_app_window_launcher_controller.h"
 
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
+#include "chrome/browser/chromeos/ash_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
@@ skipping 45 matching lines @@
     return;
 
   AppWindowRegistry* registry = AppWindowRegistry::Get(profile);
   if (registry_.find(registry) != registry_.end())
     return;
 
   registry->AddObserver(this);
   registry_.insert(registry);
 }
 
+void ExtensionAppWindowLauncherController::OnAppWindowAdded(
+    extensions::AppWindow* app_window) {
+  // TODO(msw): Determine why this only seems to be called in Mash. Setting the

[James Cook, 2017/06/08 17:14:00]

File a bug for this.

+  // ShelfItemType as early as possible is important on Mash, to prevent Ash's
+  // ShelfWindowWatcher from creating a conflicting ShelfItem. Set the item type
+  // here for the mash config, and later on in RegisterApp for classic ash.
+  if (chromeos::GetAshConfig() != ash::Config::MASH)
+    return;
+
+  const ash::ShelfID shelf_id = GetShelfId(app_window);
+  DCHECK(!shelf_id.IsNull());
+  aura::Window* window = app_window->GetNativeWindow();
+  window->SetProperty<int>(
+      ash::kShelfItemTypeKey,
+      app_window->window_type_is_panel() ? ash::TYPE_APP_PANEL : ash::TYPE_APP);
+  window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
+}
+
 void ExtensionAppWindowLauncherController::OnAppWindowShown(
     AppWindow* app_window,
     bool was_hidden) {
   aura::Window* window = app_window->GetNativeWindow();
   if (!IsRegisteredApp(window))
     RegisterApp(app_window);
 }
 
 void ExtensionAppWindowLauncherController::OnAppWindowHidden(
     AppWindow* app_window) {
   aura::Window* window = app_window->GetNativeWindow();
   if (IsRegisteredApp(window))
     UnregisterApp(window);
 }
 
 // Called from aura::Window::~Window(), before delegate_->OnWindowDestroyed()
 // which destroys AppWindow, so both |window| and the associated AppWindow
 // are valid here.
 void ExtensionAppWindowLauncherController::OnWindowDestroying(
     aura::Window* window) {
   UnregisterApp(window);
 }
 
 void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {
+  aura::Window* window = app_window->GetNativeWindow();
   const ash::ShelfID shelf_id = GetShelfId(app_window);
   DCHECK(!shelf_id.IsNull());
-  aura::Window* window = app_window->GetNativeWindow();
-  window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
+
+  // TODO(msw): Determine why OnAppWindowAdded only seems to be called in Mash.
+  if (chromeos::GetAshConfig() != ash::Config::MASH) {
+    window->SetProperty(ash::kShelfIDKey,
+                        new std::string(shelf_id.Serialize()));
+    window->SetProperty<int>(ash::kShelfItemTypeKey,
+                             app_window->window_type_is_panel()
+                                 ? ash::TYPE_APP_PANEL
+                                 : ash::TYPE_APP);
+  }
 
   // Windows created by IME extension should be treated the same way as the
   // virtual keyboard window, which does not register itself in launcher.
   // Ash's ShelfWindowWatcher handles app panel windows separately.
   if (app_window->is_ime_window() || app_window->window_type_is_panel())
     return;
 
   // Get the app's shelf identifier and add an entry to the map.
   DCHECK_EQ(window_to_shelf_id_map_.count(window), 0u);
   window_to_shelf_id_map_[window] = shelf_id;
@@ skipping 65 matching lines @@
 ExtensionAppWindowLauncherController::ControllerForWindow(
     aura::Window* window) {
   const auto window_iter = window_to_shelf_id_map_.find(window);
   if (window_iter == window_to_shelf_id_map_.end())
     return nullptr;
   const auto controller_iter = app_controller_map_.find(window_iter->second);
   if (controller_iter == app_controller_map_.end())
     return nullptr;
   return controller_iter->second;
 }