mash: Convert ShelfWindowWatcher to wm common types

ash/aura/wm_window_aura.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/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_root_window_controller_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
@@ skipping 260 matching lines @@
   if (key == WmWindowProperty::SHELF_ID)
     return GetShelfIDForWindow(window_);
 
   if (key == WmWindowProperty::TOP_VIEW_INSET)
     return window_->GetProperty(aura::client::kTopViewInset);
 
   NOTREACHED();
   return 0;
 }
 
+void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
+  if (key == WmWindowProperty::SHELF_ID) {
+    SetShelfIDForWindow(value, window_);
+    return;
+  }
+
+  NOTREACHED();
+}
+
+ShelfItemDetails* WmWindowAura::GetShelfItemDetails() {
+  return window_->GetProperty(kShelfItemDetailsKey);
+}
+
 const wm::WindowState* WmWindowAura::GetWindowState() const {
   return ash::wm::GetWindowState(window_);
 }
 
 WmWindow* WmWindowAura::GetToplevelWindow() {
   return Get(window_->GetToplevelWindow());
 }
 
 WmWindow* WmWindowAura::GetToplevelWindowForFocus() {
   return Get(::wm::GetToplevelWindow(window_));
@@ skipping 412 matching lines @@
     ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
     return;
   }
   WmWindowProperty wm_property;
   if (key == kSnapChildrenToPixelBoundary) {
     wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY;
   } else if (key == aura::client::kAlwaysOnTopKey) {
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
   } else if (key == kShelfID) {
     wm_property = WmWindowProperty::SHELF_ID;
+  } else if (key == kShelfItemDetailsKey) {
+    wm_property = WmWindowProperty::SHELF_ITEM_DETAILS;
   } else if (key == aura::client::kTopViewInset) {
     wm_property = WmWindowProperty::TOP_VIEW_INSET;
   } else if (key == aura::client::kExcludeFromMruKey) {
     wm_property = WmWindowProperty::EXCLUDE_FROM_MRU;
   } else {
     return;
   }
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowPropertyChanged(this, wm_property));
 }
@@ skipping 23 matching lines @@
                                              bool visible) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowVisibilityChanged(this, visible));
 }
 
 void WmWindowAura::OnWindowTitleChanged(aura::Window* window) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowTitleChanged(this));
 }
 
 }  // namespace ash