mash: Limit ShelfWindowWatcher to panels and dialogs.

ash/shelf/shelf_window_watcher.cc

 // Copyright 2013 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 "ash/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/resources/grit/ui_resources.h"
-#include "ui/wm/core/transient_window_controller.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 namespace {
 
 // Returns the window's shelf item type property value.
-// Mash provides an initial default shelf item type for untyped windows.
+// Mash returns the dialog type for normal windows without shelf item types.
 // TODO(msw): Extend this Mash behavior to all Ash configs.
 ShelfItemType GetShelfItemType(aura::Window* window) {
   if (Shell::GetAshConfig() == Config::MASH &&
       window->GetProperty(kShelfItemTypeKey) == TYPE_UNDEFINED &&
+      window->type() == aura::client::WINDOW_TYPE_NORMAL &&
       !wm::GetWindowState(window)->ignored_by_shelf()) {
     return TYPE_DIALOG;
   }
   return static_cast<ShelfItemType>(window->GetProperty(kShelfItemTypeKey));
 }
 
 // Returns the window's shelf id property value, or provides a default value.
-// Mash provides an initial default shelf id for unidentified windows.
+// Mash sets and returns an initial default shelf id for unidentified windows.
 // TODO(msw): Extend this Mash behavior to all Ash configs.
 ShelfID GetShelfID(aura::Window* window) {
   if (Shell::GetAshConfig() == Config::MASH &&
       !window->GetProperty(kShelfIDKey) &&
       !wm::GetWindowState(window)->ignored_by_shelf()) {
     static int id = 0;
     const ash::ShelfID shelf_id("ShelfWindowWatcher" + std::to_string(id++));
     window->SetProperty(kShelfIDKey, new std::string(shelf_id.Serialize()));
     return shelf_id;
   }
@@ skipping 162 matching lines @@
 void ShelfWindowWatcher::OnUserWindowDestroying(aura::Window* window) {
   if (observed_user_windows_.IsObserving(window))
     observed_user_windows_.Remove(window);
 
   if (user_windows_with_items_.count(window) > 0)
     RemoveShelfItem(window);
   DCHECK_EQ(0u, user_windows_with_items_.count(window));
 }
 
 void ShelfWindowWatcher::OnUserWindowPropertyChanged(aura::Window* window) {
-  if (GetShelfItemType(window) == TYPE_UNDEFINED ||
-      GetShelfID(window).IsNull() ||
-      ::wm::TransientWindowController::Get()->GetTransientParent(window)) {
+  // ShelfWindowWatcher only handles panels and dialogs for now, all other shelf
+  // item types are handled by ChromeLauncherController.
+  const ShelfItemType item_type = GetShelfItemType(window);
+  if ((item_type != TYPE_APP_PANEL && item_type != TYPE_DIALOG) ||
+      GetShelfID(window).IsNull()) {
     // Remove |window|'s ShelfItem if it was added by ShelfWindowWatcher.
     if (user_windows_with_items_.count(window) > 0)
       RemoveShelfItem(window);
     return;
   }
 
   // Update an existing ShelfWindowWatcher item when a window property changes.
   int index = model_->ItemIndexByID(GetShelfID(window));
   if (index > 0 && user_windows_with_items_.count(window) > 0) {
     ShelfItem item = model_->items()[index];
     UpdateShelfItemForWindow(&item, window);
     model_->Set(index, item);
     return;
   }
 
-  // Create a new ShelfWindowWatcher item for |window|.
-  if (index < 0)
+  // Create a new item for |window|, if it is visible or a [minimized] panel.

[sky, 2017/06/07 23:50:22]

Is the assumption that !visible=minimized for panels valid?

[msw, 2017/06/08 00:00:11]

Minimized panel windows are not visible; so it's sufficient to create shelf
items for panel windows that are not visible to cover the minimized case. I
could add more rigorous checks around the window type/container and
WindowState::IsMinimized(), but that seems unnecessary (at least for now).
Hopefully we're actually removing panels soon!

+  if (index < 0 && (window->IsVisible() || item_type == TYPE_APP_PANEL))
     AddShelfItem(window);
 }
 
 void ShelfWindowWatcher::OnWindowActivated(ActivationReason reason,
                                            aura::Window* gained_active,
                                            aura::Window* lost_active) {
   if (gained_active && user_windows_with_items_.count(gained_active) > 0)
     OnUserWindowPropertyChanged(gained_active);
   if (lost_active && user_windows_with_items_.count(lost_active) > 0)
     OnUserWindowPropertyChanged(lost_active);
@@ skipping 21 matching lines @@
   }
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash