Changes ownership of WindowTreeClient

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"
@@ skipping 88 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) {
-  new ui::WindowTreeClient(this, nullptr, std::move(request));
+  window_tree_client_ =
+      base::MakeUnique<ui::WindowTreeClient>(this, nullptr, std::move(request));
 }
 
 void ViewImpl::ShowInterstitial(const mojo::String& html) {
   content::InterstitialPage* interstitial =
       content::InterstitialPage::Create(web_view_->GetWebContents(),
                                         false,
                                         GURL(),
                                         new InterstitialPageDelegate(html));
   interstitial->Show();
 }
@@ skipping 147 matching lines @@
   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::SurfaceType::DEFAULT);
   widget_->Init(params);
   widget_->Show();
 }
 
-void ViewImpl::OnDidDestroyClient(ui::WindowTreeClient* client) {}
+void ViewImpl::OnEmbedRootDestroyed(ui::Window* root) {
+  window_tree_client_.reset();
+}
+
+void ViewImpl::OnLostConnection(ui::WindowTreeClient* client) {
+  window_tree_client_.reset();
+}
+
 void ViewImpl::OnPointerEventObserved(const ui::PointerEvent& event,
                                       ui::Window* target) {}
 
 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