Move shelf item tooltip flag from delegate to item.

ash/common/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/common/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 20 matching lines @@
     item->status = STATUS_ACTIVE;
   else if (window->GetBoolProperty(WmWindowProperty::DRAW_ATTENTION))
     item->status = STATUS_ATTENTION;
 
   item->app_id = window->GetStringProperty(WmWindowProperty::APP_ID);
 
   // Prefer app icons over window icons, they're typically larger.
   item->image = window->GetAppIcon();
   if (item->image.isNull())
     item->image = window->GetWindowIcon();
+
+  // Do not show tooltips for visible attached app panel windows.
+  item->shows_tooltip =
+      item->type != TYPE_APP_PANEL || !window->IsVisible() ||
+      !window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED);
 }
 
 }  // namespace
 
 ShelfWindowWatcher::ContainerWindowObserver::ContainerWindowObserver(
     ShelfWindowWatcher* window_watcher)
     : window_watcher_(window_watcher) {}
 
 ShelfWindowWatcher::ContainerWindowObserver::~ContainerWindowObserver() {}
 
@@ skipping 22 matching lines @@
     : window_watcher_(window_watcher) {}
 
 ShelfWindowWatcher::UserWindowObserver::~UserWindowObserver() {}
 
 void ShelfWindowWatcher::UserWindowObserver::OnWindowPropertyChanged(
     WmWindow* window,
     WmWindowProperty property) {
   if (property == WmWindowProperty::APP_ICON ||
       property == WmWindowProperty::APP_ID ||
       property == WmWindowProperty::DRAW_ATTENTION ||
+      property == WmWindowProperty::PANEL_ATTACHED ||
       property == WmWindowProperty::SHELF_ITEM_TYPE ||
       property == WmWindowProperty::WINDOW_ICON) {
     window_watcher_->OnUserWindowPropertyChanged(window);
   }
 }
 
 void ShelfWindowWatcher::UserWindowObserver::OnWindowDestroying(
     WmWindow* window) {
   window_watcher_->OnUserWindowDestroying(window);
 }
 
+void ShelfWindowWatcher::UserWindowObserver::OnWindowVisibilityChanged(
+    WmWindow* window,
+    bool visible) {
+  // The tooltip behavior for panel windows depends on the panel visibility.
+  window_watcher_->OnUserWindowPropertyChanged(window);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 ShelfWindowWatcher::ShelfWindowWatcher(ShelfModel* model)
     : model_(model),
       container_window_observer_(this),
       user_window_observer_(this),
       observed_container_windows_(&container_window_observer_),
       observed_user_windows_(&user_window_observer_) {
   WmShell::Get()->AddActivationObserver(this);
   for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
@@ skipping 108 matching lines @@
     observed_container_windows_.Add(panel_container);
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash