Converts services/navigation to use aura-mus

services/navigation/view_impl.cc

 // 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.
 
 #include "services/navigation/view_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/ui/public/cpp/window_tree_client.h"
+#include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 namespace navigation {
 namespace {
 
 class InterstitialPageDelegate : public content::InterstitialPageDelegate {
  public:
@@ skipping 42 matching lines @@
       &web_view_->GetWebContents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                  content::Source<content::NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<content::NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED,
                  content::Source<content::NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED,
                  content::Source<content::NavigationController>(controller));
 }
-ViewImpl::~ViewImpl() {}
+
+ViewImpl::~ViewImpl() {
+  DeleteTreeAndWidget();
+}
+
+void ViewImpl::DeleteTreeAndWidget() {
+  widget_.reset();
+  window_tree_host_.reset();
+  window_tree_client_.reset();
+}
 
 void ViewImpl::NavigateTo(const GURL& url) {
   web_view_->GetWebContents()->GetController().LoadURL(
       url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
 }
 
 void ViewImpl::GoBack() {
   web_view_->GetWebContents()->GetController().GoBack();
 }
 
@@ skipping 10 matching lines @@
     web_view_->GetWebContents()->GetController().Reload(true);
   else
     web_view_->GetWebContents()->GetController().ReloadBypassingCache(true);
 }
 
 void ViewImpl::Stop() {
   web_view_->GetWebContents()->Stop();
 }
 
 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) {
-  window_tree_client_ =
-      base::MakeUnique<ui::WindowTreeClient>(this, nullptr, std::move(request));
+  window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>(
+      connector_.get(), this, nullptr, std::move(request));
 }
 
 void ViewImpl::ShowInterstitial(const std::string& html) {
   content::InterstitialPage* interstitial =
       content::InterstitialPage::Create(web_view_->GetWebContents(),
                                         false,
                                         GURL(),
                                         new InterstitialPageDelegate(html));
   interstitial->Show();
 }
@@ skipping 125 matching lines @@
           content::Details<content::PrunedDetails>(details).ptr();
       client_->NavigationListPruned(pd->from_front, pd->count);
       break;
     }
   default:
     NOTREACHED();
     break;
   }
 }
 
-void ViewImpl::OnEmbed(ui::Window* root) {
+void ViewImpl::OnEmbed(
+    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
+  // TODO: Supplying a WindowTreeHostMus isn't particularly ideal in this case.
+  // In particular it would be nice if the WindowTreeClientDelegate could create
+  // its own WindowTreeHostMus, that way this code could directly create a
+  // DesktopWindowTreeTreeHostMus.
+  window_tree_host_ = std::move(window_tree_host);
   DCHECK(!widget_.get());
+  // TODO: fix this. The following won't work if multiple WindowTreeClients
+  // are used at the same time. The best fix is to have the ability to specify
+  // a WindowTreeClient when DesktopNativeWidgetAura is created so that it can
+  // create WindowPortMus with the correct client.
   widget_.reset(new views::Widget);
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = this;
-  params.native_widget = new views::NativeWidgetMus(
-      widget_.get(), root, ui::mojom::CompositorFrameSinkType::DEFAULT);
   widget_->Init(params);
   widget_->Show();
 }
 
-void ViewImpl::OnEmbedRootDestroyed(ui::Window* root) {
-  window_tree_client_.reset();
+void ViewImpl::OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) {
+  DCHECK_EQ(window_tree_host, window_tree_host_.get());
+  DeleteTreeAndWidget();
 }
 
-void ViewImpl::OnLostConnection(ui::WindowTreeClient* client) {
-  window_tree_client_.reset();
+void ViewImpl::OnLostConnection(aura::WindowTreeClient* client) {
+  DeleteTreeAndWidget();
 }
 
 void ViewImpl::OnPointerEventObserved(const ui::PointerEvent& event,
-                                      ui::Window* target) {}
+                                      aura::Window* target) {}
+
+aura::client::CaptureClient* ViewImpl::GetCaptureClient() {
+  // TODO: wire this up. This typically comes from WMState.
+  return nullptr;
+}
+
+aura::PropertyConverter* ViewImpl::GetPropertyConverter() {
+  // TODO: wire this up.
+  return nullptr;
+}
 
 views::View* ViewImpl::GetContentsView() {
   return web_view_;
 }
 
 views::Widget* ViewImpl::GetWidget() {
   return web_view_->GetWidget();
 }
 
 const views::Widget* ViewImpl::GetWidget() const {
   return web_view_->GetWidget();
 }
 
 }  // navigation