aura-mus: Implement stacking in DesktopWindowTreeHostMus.

ui/views/mus/mus_client.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 UI_VIEWS_MUS_MUS_CLIENT_H_
 #define UI_VIEWS_MUS_MUS_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 41 matching lines @@
 class MusClientObserver;
 class PointerWatcherEventRouter;
 class ScreenMus;
 
 namespace internal {
 class NativeWidgetDelegate;
 }
 
 namespace test {
 class MusClientTestApi;
+class MusClientTestObserver;
 }
 
 // MusClient establishes a connection to mus and sets up necessary state so that
 // aura and views target mus. This class is useful for typical clients, not the
 // WindowManager. Most clients don't create this directly, rather use
 // AuraInit.
 class VIEWS_MUS_EXPORT MusClient
     : public aura::WindowTreeClientDelegate,
       public ScreenMusDelegate,
       public ui::OSExchangeDataProviderFactory::Factory {
@@ skipping 43 matching lines @@
   friend class AuraInit;
   friend class test::MusClientTestApi;
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnLostConnection(aura::WindowTreeClient* client) override;
   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override;
+  void OnChangeCompleted(aura::ChangeType type, bool success) override;
   aura::client::CaptureClient* GetCaptureClient() override;
   aura::PropertyConverter* GetPropertyConverter() override;
 
   // ScreenMusDelegate:
   void OnWindowManagerFrameValuesChanged() override;
   aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
 
   // ui:OSExchangeDataProviderFactory::Factory:
   std::unique_ptr<OSExchangeData::Provider> BuildProvider() override;
 
   static MusClient* instance_;
 
   service_manager::Identity identity_;
 
   std::unique_ptr<base::Thread> io_thread_;
 
   base::ObserverList<MusClientObserver> observer_list_;
 
+  // An observer that's only set during tests to listen for internal events.
+  test::MusClientTestObserver* test_observer_;
+
   // NOTE: this may be null (creation is based on argument supplied to
   // constructor).
   std::unique_ptr<wm::WMState> wm_state_;
 
   std::unique_ptr<ScreenMus> screen_;
 
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
   std::unique_ptr<ui::Gpu> gpu_;
 
   std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
 
   std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
 
   std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusClient);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_MUS_CLIENT_H_