Random fixes for mash bridge classes

mash/wm/bridge/wm_window_mus.h

Index: mash/wm/bridge/wm_window_mus.h
diff --git a/mash/wm/bridge/wm_window_mus.h b/mash/wm/bridge/wm_window_mus.h
index c973a5f0fee9ae4dd80ce660e32f27ff2cd6379e..5e5b09a3d31884888b886f04fa5f27b60c3b514f 100644
--- a/mash/wm/bridge/wm_window_mus.h
+++ b/mash/wm/bridge/wm_window_mus.h
@@ -73,6 +73,10 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver {
     return static_cast<const WmWindowMus*>(window);
   }
 
+  ash::wm::WindowState* GetWindowState() {
+    return ash::wm::WmWindow::GetWindowState();
+  }
+
   // WmWindow:
   const ash::wm::WmWindow* GetRootWindow() const override;
   ash::wm::WmRootWindowController* GetRootWindowController() override;
@@ -163,8 +167,6 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver {
   void RemoveObserver(ash::wm::WmWindowObserver* observer) override;
 
  private:
-  void NotifyStackingChanged();
-
   // mus::WindowObserver:
   void OnTreeChanged(const TreeChangeParams& params) override;
   void OnWindowReordered(mus::Window* window,
@@ -181,6 +183,9 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver {
   void OnWindowDestroying(mus::Window* window) override;
 
   mus::Window* window_;
+
+  int shell_window_id_ = -1;

[James Cook, 2016/05/17 16:36:04]

nit: Is this a container id? If so, may comment that?

[sky, 2016/05/17 16:59:46]

It's one of the ids defined in wm_shell_window_ids. I added a comment.

+
   std::unique_ptr<ash::wm::WindowState> window_state_;
 
   views::Widget* widget_ = nullptr;