Random fixes for mash bridge classes

mash/wm/bridge/wm_window_mus.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 MASH_WM_BRIDGE_WM_WINDOW_MUS_H_
 #define MASH_WM_BRIDGE_WM_WINDOW_MUS_H_
 
 #include <memory>
 
 #include "ash/wm/common/wm_window.h"
@@ skipping 55 matching lines @@
   }
   const WmRootWindowControllerMus* GetRootWindowControllerMus() const;
 
   static WmWindowMus* AsWmWindowMus(ash::wm::WmWindow* window) {
     return static_cast<WmWindowMus*>(window);
   }
   static const WmWindowMus* AsWmWindowMus(const ash::wm::WmWindow* window) {
     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;
   ash::wm::WmGlobals* GetGlobals() const override;
   void SetShellWindowId(int id) override;
   int GetShellWindowId() const override;
   ash::wm::WmWindow* GetChildByShellWindowId(int id) override;
   ui::wm::WindowType GetType() const override;
   ui::Layer* GetLayer() override;
   display::Display GetDisplayNearestWindow() override;
@@ skipping 70 matching lines @@
   void StackChildAbove(ash::wm::WmWindow* child,
                        ash::wm::WmWindow* target) override;
   void StackChildBelow(ash::wm::WmWindow* child,
                        ash::wm::WmWindow* target) override;
   std::vector<ash::wm::WmWindow*> GetChildren() override;
   void SnapToPixelBoundaryIfNecessary() override;
   void AddObserver(ash::wm::WmWindowObserver* observer) override;
   void RemoveObserver(ash::wm::WmWindowObserver* observer) override;
 
  private:
-  void NotifyStackingChanged();
-
   // mus::WindowObserver:
   void OnTreeChanged(const TreeChangeParams& params) override;
   void OnWindowReordered(mus::Window* window,
                          mus::Window* relative_window,
                          mus::mojom::OrderDirection direction) override;
   void OnWindowSharedPropertyChanged(
       mus::Window* window,
       const std::string& name,
       const std::vector<uint8_t>* old_data,
       const std::vector<uint8_t>* new_data) override;
   void OnWindowBoundsChanged(mus::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
   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;
 
   base::ObserverList<ash::wm::WmWindowObserver> observers_;
 
   std::unique_ptr<MusLayoutManagerAdapter> layout_manager_adapter_;
 
   std::unique_ptr<gfx::Rect> restore_bounds_in_screen_;
 
   ui::WindowShowState restore_show_state_ = ui::SHOW_STATE_DEFAULT;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowMus);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_BRIDGE_WM_WINDOW_MUS_H_