Converts more services to use aura-mus

This time around views_examples, task_viewer and webtest. BUG=673866 TEST=none R=ben@chromium.org Review-Url: https://codereview.chromium.org/2569413003 Cr-Commit-Position: refs/heads/master@{#438424}
Denger-Network · Dec 14, 2016 · 6bd75ef · 6bd75ef
1 parent 302d3c2
commit 6bd75ef
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 35 deletions.
diff --git a/mash/example/views_examples/BUILD.gn b/mash/example/views_examples/BUILD.gn
@@ -36,7 +36,6 @@ service("views_examples") {
 
   data_deps = [
     ":manifest",
-    "//services/ui",
   ]
 }
 

diff --git a/mash/example/views_examples/views_examples.cc b/mash/example/views_examples/views_examples.cc
@@ -20,12 +20,6 @@
 #include "ui/views/examples/example_base.h"
 #include "ui/views/examples/examples_window.h"
 #include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/window_manager_connection.h"
-
-namespace views {
-class AuraInit;
-class WindowManagerConnection;
-}
 
 class ViewsExamples
     : public service_manager::Service,
@@ -41,9 +35,8 @@ class ViewsExamples
     tracing_.Initialize(context()->connector(), context()->identity().name());
     aura_init_ = base::MakeUnique<views::AuraInit>(
         context()->connector(), context()->identity(),
-        "views_mus_resources.pak");
-    window_manager_connection_ = views::WindowManagerConnection::Create(
-        context()->connector(), context()->identity());
+        "views_mus_resources.pak", std::string(), nullptr,
+        views::AuraInit::Mode::AURA_MUS);
   }
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
@@ -67,7 +60,6 @@ class ViewsExamples
 
   tracing::Provider tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
-  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsExamples);
 };

diff --git a/mash/task_viewer/BUILD.gn b/mash/task_viewer/BUILD.gn
@@ -25,10 +25,6 @@ source_set("lib") {
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
   ]
-
-  data_deps = [
-    "//services/ui",
-  ]
 }
 
 service("task_viewer") {

diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
@@ -31,7 +31,7 @@
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
@@ -295,9 +295,8 @@ void TaskViewer::OnStart() {
   tracing_.Initialize(context()->connector(), context()->identity().name());
 
   aura_init_ = base::MakeUnique<views::AuraInit>(
-      context()->connector(), context()->identity(), "views_mus_resources.pak");
-  window_manager_connection_ = views::WindowManagerConnection::Create(
-      context()->connector(), context()->identity());
+      context()->connector(), context()->identity(), "views_mus_resources.pak",
+      std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
 }
 
 bool TaskViewer::OnConnect(const service_manager::ServiceInfo& remote_info,

diff --git a/mash/task_viewer/task_viewer.h b/mash/task_viewer/task_viewer.h
@@ -19,7 +19,6 @@
 namespace views {
 class AuraInit;
 class Widget;
-class WindowManagerConnection;
 }
 
 namespace mash {
@@ -53,7 +52,6 @@ class TaskViewer
 
   tracing::Provider tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
-  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskViewer);
 };

diff --git a/mash/webtest/BUILD.gn b/mash/webtest/BUILD.gn
@@ -24,6 +24,7 @@ source_set("lib") {
     "//services/service_manager/public/interfaces",
     "//services/tracing/public/cpp",
     "//services/ui/public/cpp",
+    "//ui/aura",
     "//ui/gfx/geometry/mojo",
     "//ui/native_theme",
     "//ui/views",
@@ -52,7 +53,6 @@ service("webtest") {
 
   data_deps = [
     ":manifest",
-    "//services/ui",
   ]
 }
 

diff --git a/mash/webtest/webtest.cc b/mash/webtest/webtest.cc
@@ -20,9 +20,8 @@
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/tracing/public/cpp/provider.h"
-#include "services/ui/public/cpp/window.h"
-#include "services/ui/public/cpp/window_tree_client.h"
-#include "ui/aura/mus/mus_util.h"
+#include "ui/aura/mus/window_port_mus.h"
+#include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_throbber.h"
 #include "ui/native_theme/native_theme.h"
@@ -31,7 +30,7 @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "url/gurl.h"
 
@@ -41,6 +40,12 @@ class AuraInit;
 
 namespace mash {
 namespace webtest {
+namespace {
+
+// Callback from Embed().
+void EmbedCallback(bool result) {}
+
+}  // namespace
 
 class UI : public views::WidgetDelegateView,
            public navigation::mojom::ViewClient {
@@ -89,13 +94,16 @@ class UI : public views::WidgetDelegateView,
   void ViewHierarchyChanged(
       const views::View::ViewHierarchyChangedDetails& details) override {
     if (details.is_add && GetWidget() && !content_area_) {
-      ui::Window* window = aura::GetMusWindow(GetWidget()->GetNativeWindow());
-      content_area_ = window->window_tree()->NewWindow(nullptr);
+      aura::Window* window = GetWidget()->GetNativeWindow();
+      content_area_ = new aura::Window(nullptr);
+      content_area_->Init(ui::LAYER_NOT_DRAWN);
       window->AddChild(content_area_);
 
       ui::mojom::WindowTreeClientPtr client;
       view_->GetWindowTreeClient(GetProxy(&client));
-      content_area_->Embed(std::move(client));
+      const uint32_t embed_flags = 0;  // Nothing special.
+      aura::WindowPortMus::Get(content_area_)
+          ->Embed(std::move(client), embed_flags, base::Bind(&EmbedCallback));
     }
   }
 
@@ -135,7 +143,7 @@ class UI : public views::WidgetDelegateView,
   void NavigationListPruned(bool from_front, int count) override {}
 
   Webtest* webtest_;
-  ui::Window* content_area_ = nullptr;
+  aura::Window* content_area_ = nullptr;
   navigation::mojom::ViewPtr view_;
   mojo::Binding<navigation::mojom::ViewClient> view_client_binding_;
   base::string16 current_title_;
@@ -161,9 +169,8 @@ void Webtest::RemoveWindow(views::Widget* window) {
 void Webtest::OnStart() {
   tracing_.Initialize(context()->connector(), context()->identity().name());
   aura_init_ = base::MakeUnique<views::AuraInit>(
-      context()->connector(), context()->identity(), "views_mus_resources.pak");
-  window_manager_connection_ = views::WindowManagerConnection::Create(
-      context()->connector(), context()->identity());
+      context()->connector(), context()->identity(), "views_mus_resources.pak",
+      std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
 }
 
 bool Webtest::OnConnect(const service_manager::ServiceInfo& remote_info,

diff --git a/mash/webtest/webtest.h b/mash/webtest/webtest.h
@@ -17,7 +17,6 @@
 namespace views {
 class AuraInit;
 class Widget;
-class WindowManagerConnection;
 }
 
 namespace mash {
@@ -51,7 +50,6 @@ class Webtest : public service_manager::Service,
 
   tracing::Provider tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
-  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(Webtest);
 };