mash: Convert ShelfWindowWatcher to wm common types

ash/aura/wm_window_aura.h

 // 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.
 
 #ifndef ASH_AURA_WM_WINDOW_AURA_H_
 #define ASH_AURA_WM_WINDOW_AURA_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/wm_window.h"
 #include "base/macros.h"
@@ skipping 56 matching lines @@
   gfx::Size GetMaximumSize() const override;
   bool GetTargetVisibility() const override;
   bool IsVisible() const override;
   void SetOpacity(float opacity) override;
   float GetTargetOpacity() const override;
   void SetTransform(const gfx::Transform& transform) override;
   gfx::Transform GetTargetTransform() const override;
   bool IsSystemModal() const override;
   bool GetBoolProperty(WmWindowProperty key) override;
   int GetIntProperty(WmWindowProperty key) override;
+  void SetIntProperty(WmWindowProperty key, int value) override;
+  ShelfItemDetails* GetShelfItemDetails() override;
   const wm::WindowState* GetWindowState() const override;
   WmWindow* GetToplevelWindow() override;
   WmWindow* GetToplevelWindowForFocus() override;
   void SetParentUsingContext(WmWindow* context,
                              const gfx::Rect& screen_bounds) override;
   void AddChild(WmWindow* window) override;
   WmWindow* GetParent() override;
   const WmWindow* GetTransientParent() const override;
   std::vector<WmWindow*> GetTransientChildren() override;
   void SetLayoutManager(
@@ skipping 92 matching lines @@
   aura::Window* window_;
 
   base::ObserverList<WmWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_WINDOW_AURA_H_