Converts services/navigation to use aura-mus

services/navigation/view_impl.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 SERVICES_NAVIGATION_VIEW_IMPL_H_
 #define SERVICES_NAVIGATION_VIEW_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
-#include "services/ui/public/cpp/window_tree_client_delegate.h"
+#include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace views {
 class WebView;
 class Widget;
 }
 
 namespace navigation {
 
 class ViewImpl : public mojom::View,
                  public content::WebContentsDelegate,
                  public content::NotificationObserver,
-                 public ui::WindowTreeClientDelegate,
+                 public aura::WindowTreeClientDelegate,
                  public views::WidgetDelegate {
  public:
   ViewImpl(std::unique_ptr<service_manager::Connector> connector,
            const std::string& client_user_id,
            mojom::ViewClientPtr client,
            std::unique_ptr<service_manager::ServiceContextRef> ref);
   ~ViewImpl() override;
 
  private:
+  void DeleteTreeAndWidget();
+
   // mojom::View:
   void NavigateTo(const GURL& url) override;
   void GoBack() override;
   void GoForward() override;
   void NavigateToOffset(int offset) override;
   void Reload(bool skip_cache) override;
   void Stop() override;
   void GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) override;
   void ShowInterstitial(const std::string& html) override;
   void HideInterstitial() override;
@@ skipping 15 matching lines @@
                               content::InvalidateTypes changed_flags) override;
   void LoadProgressChanged(content::WebContents* source,
                            double progress) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
 
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
-  // ui::WindowTreeClientDelegate:
-  void OnEmbed(ui::Window* root) override;
-  void OnEmbedRootDestroyed(ui::Window* root) override;
-  void OnLostConnection(ui::WindowTreeClient* client) override;
+  // aura::WindowTreeClientDelegate:
+  void OnEmbed(
+      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
+  void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
+  void OnLostConnection(aura::WindowTreeClient* client) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
-                              ui::Window* target) override;
+                              aura::Window* target) override;
+  aura::client::CaptureClient* GetCaptureClient() override;
+  aura::PropertyConverter* GetPropertyConverter() override;
 
   // views::WidgetDelegate:
   views::View* GetContentsView() override;
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
 
   std::unique_ptr<service_manager::Connector> connector_;
   mojom::ViewClientPtr client_;
   std::unique_ptr<service_manager::ServiceContextRef> ref_;
 
-  std::unique_ptr<ui::WindowTreeClient> window_tree_client_;
+  std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
   views::WebView* web_view_;
 
   std::unique_ptr<content::WebContents> web_contents_;
 
   content::NotificationRegistrar registrar_;
 
+  std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
   std::unique_ptr<views::Widget> widget_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewImpl);
 };
 
 }  // navigation
 
 #endif  // SERVICES_NAVIGATION_VIEW_IMPL_H_