mash: Support ShelfWindowWatcher via ShelfItem properties.

ash/mus/bridge/wm_window_mus.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 "ash/mus/bridge/wm_window_mus.h"
 
+#include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_transient_window_observer.h"
 #include "ash/common/wm_window_observer.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/mus/bridge/mus_layout_manager_adapter.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/property_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/display.h"
+#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 MUS_DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmWindowMus*);
 
 namespace {
 
 MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::mus::WmWindowMus,
                                      kWmWindowKey,
                                      nullptr);
 
 }  // namespace
 
 namespace ash {
 namespace mus {
 
 namespace {
 
-// This classes is used so that the WindowState constructor can be made
-// protected. GetWindowState() is the only place that should be creating
-// WindowState.
+// This class is used so that the WindowState constructor can be made protected.
+// GetWindowState() is the only place that should be creating WindowState.
 class WindowStateMus : public wm::WindowState {
  public:
   explicit WindowStateMus(WmWindow* window) : wm::WindowState(window) {}
   ~WindowStateMus() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowStateMus);
 };
 
 ui::WindowShowState UIWindowShowStateFromMojom(ui::mojom::ShowState state) {
@@ skipping 127 matching lines @@
   }
 }
 
 std::string WmWindowMus::GetName() const {
   return window_->HasSharedProperty(ui::mojom::WindowManager::kName_Property)
              ? window_->GetSharedProperty<std::string>(
                    ui::mojom::WindowManager::kName_Property)
              : std::string();
 }
 
+void WmWindowMus::SetTitle(const base::string16& title) {
+  SetWindowTitle(window_, title);
+}
+
 base::string16 WmWindowMus::GetTitle() const {
   return GetWindowTitle(window_);
 }
 
 void WmWindowMus::SetShellWindowId(int id) {
   shell_window_id_ = id;
 }
 
 int WmWindowMus::GetShellWindowId() const {
   return shell_window_id_;
@@ skipping 158 matching lines @@
   if (key == WmWindowProperty::TOP_VIEW_COLOR) {
     // TODO: need support for TOP_VIEW_COLOR: http://crbug.com/615100.
     NOTIMPLEMENTED();
     return;
   }
 
   NOTREACHED();
 }
 
 int WmWindowMus::GetIntProperty(WmWindowProperty key) {
+  if (key == WmWindowProperty::MODAL_TYPE) {
+    // TODO: WindowTree::SetModalWindow() needs to route through WindowManager
+    // so wm can position. http://crbug.com/645996.
+    NOTIMPLEMENTED();
+    return static_cast<int>(ui::MODAL_TYPE_NONE);
+  }
+
+  if (key == WmWindowProperty::SHELF_ICON_ID) {
+    if (window_->HasSharedProperty(
+            ui::mojom::WindowManager::kShelfIconId_Property)) {
+      return window_->GetSharedProperty<int>(
+          ui::mojom::WindowManager::kShelfIconId_Property);
+    }
+    // Mash provides a default shelf icon image.
+    // TODO(msw): Support icon resource ids and bitmaps:
+    // mojo::Array<uint8_t> app_icon = GetWindowAppIcon(window_);
+    return IDR_DEFAULT_FAVICON;
+  }
+
   if (key == WmWindowProperty::SHELF_ID) {
     NOTIMPLEMENTED();
-    return 0;
+    return kInvalidShelfID;

[James Cook, 2016/09/28 20:41:03]

Good catch.

[msw, 2016/09/28 23:27:46]

Acknowledged.

+  }
+
+  if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
+    if (window_->HasSharedProperty(
+            ui::mojom::WindowManager::kShelfItemType_Property)) {
+      return window_->GetSharedProperty<int>(
+          ui::mojom::WindowManager::kShelfItemType_Property);
+    }
+    // Mash provides a default shelf item type for non-ignored windows.
+    return GetWindowIgnoredByShelf(window_) ? TYPE_UNDEFINED
+                                            : TYPE_PLATFORM_APP;
   }
 
   if (key == WmWindowProperty::TOP_VIEW_INSET) {
     // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
     NOTIMPLEMENTED();
     return 0;
   }
 
-  if (key == WmWindowProperty::MODAL_TYPE) {
-    // TODO: WindowTree::SetModalWindow() needs to route through WindowManager
-    // so wm can position. http://crbug.com/645996.
-    NOTIMPLEMENTED();
-    return static_cast<int>(ui::MODAL_TYPE_NONE);
-  }
-
   NOTREACHED();
   return 0;
 }
 
 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) {
+  if (key == WmWindowProperty::SHELF_ICON_ID) {
+    window_->SetSharedProperty<int>(
+        ui::mojom::WindowManager::kShelfIconId_Property, value);
+    return;
+  }
+
   if (key == WmWindowProperty::SHELF_ID) {
     NOTIMPLEMENTED();
     return;
   }
 
+  if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
+    window_->SetSharedProperty<int>(
+        ui::mojom::WindowManager::kShelfItemType_Property, value);
+    return;
+  }
+
   if (key == WmWindowProperty::TOP_VIEW_INSET) {
     // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
     NOTIMPLEMENTED();
     return;
   }
 
   NOTREACHED();
 }
 
-ShelfItemDetails* WmWindowMus::GetShelfItemDetails() {
-  NOTIMPLEMENTED();  // TODO: Add support; see crbug.com/634150
-  return nullptr;
-}
-
-void WmWindowMus::SetShelfItemDetails(const ShelfItemDetails& details) {
-  NOTIMPLEMENTED();  // TODO: Add support; see crbug.com/634150
-}
-
-void WmWindowMus::ClearShelfItemDetails() {
-  NOTIMPLEMENTED();  // TODO: Add support; see crbug.com/634150
-}
-
 const wm::WindowState* WmWindowMus::GetWindowState() const {
   return window_state_.get();
 }
 
 WmWindow* WmWindowMus::GetToplevelWindow() {
   return WmShellMus::GetToplevelAncestor(window_);
 }
 
 WmWindow* WmWindowMus::GetToplevelWindowForFocus() {
   // TODO(sky): resolve if we really need two notions of top-level. In the mus
@@ skipping 489 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace mus
 }  // namespace ash