components/mus/public/interfaces View => Window

This CL updates the namespace of the mojoms to mus.mojom.

BUG=542848
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/1406153004

Cr-Commit-Position: refs/heads/master@{#354643}

13 files changed, 29 insertions, 27 deletions

diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc
index ac703bc..f335951 100644
--- a/components/html_viewer/ax_provider_apptest.cc
+++ b/components/html_viewer/ax_provider_apptest.cc
@@ -86,7 +86,7 @@ TEST_F(AXProviderTest, HelloWorld) {
       application_impl()->ConnectToApplication(request.Pass());
 
   // Embed the html_viewer in a Window.
-  ViewTreeClientPtr tree_client;
+  mus::mojom::WindowTreeClientPtr tree_client;
   connection->ConnectToService(&tree_client);
   mus::Window* embed_window = window_manager()->CreateWindow();
   embed_window->Embed(tree_client.Pass());
diff --git a/components/html_viewer/document_resource_waiter.cc b/components/html_viewer/document_resource_waiter.cc
index 10f7df9..ea19d3b 100644
--- a/components/html_viewer/document_resource_waiter.cc
+++ b/components/html_viewer/document_resource_waiter.cc
@@ -219,8 +219,8 @@ void DocumentResourceWaiter::StopHighlightingFindResults() {
 
 void DocumentResourceWaiter::OnWindowViewportMetricsChanged(
     mus::Window* window,
-    const mojo::ViewportMetrics& old_metrics,
-    const mojo::ViewportMetrics& new_metrics) {
+    const mus::mojom::ViewportMetrics& old_metrics,
+    const mus::mojom::ViewportMetrics& new_metrics) {
   UpdateIsReady();
 }
 
diff --git a/components/html_viewer/document_resource_waiter.h b/components/html_viewer/document_resource_waiter.h
index be22006..ea061c4 100644
--- a/components/html_viewer/document_resource_waiter.h
+++ b/components/html_viewer/document_resource_waiter.h
@@ -97,8 +97,8 @@ class DocumentResourceWaiter : public web_view::mojom::FrameClient,
   // WindowObserver:
   void OnWindowViewportMetricsChanged(
       mus::Window* window,
-      const mojo::ViewportMetrics& old_metrics,
-      const mojo::ViewportMetrics& new_metrics) override;
+      const mus::mojom::ViewportMetrics& old_metrics,
+      const mus::mojom::ViewportMetrics& new_metrics) override;
   void OnWindowDestroyed(mus::Window* window) override;
 
   // HTMLFrameTreeManagerObserver:
diff --git a/components/html_viewer/global_state.cc b/components/html_viewer/global_state.cc
index 4400472..44ffcf3 100644
--- a/components/html_viewer/global_state.cc
+++ b/components/html_viewer/global_state.cc
@@ -175,13 +175,13 @@ void GlobalState::InitIfNecessary(const gfx::Size& screen_size_in_pixels,
 
 // TODO(rjkroege): These two functions probably do not interoperate correctly
 // with MUS.
-const mojo::GpuInfo* GlobalState::GetGpuInfo() {
+const mus::mojom::GpuInfo* GlobalState::GetGpuInfo() {
   if (gpu_service_)
     CHECK(gpu_service_.WaitForIncomingResponse()) <<"Get GPU info failed!";
   return gpu_info_.get();
 }
 
-void GlobalState::GetGpuInfoCallback(mojo::GpuInfoPtr gpu_info) {
+void GlobalState::GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info) {
   CHECK(gpu_info);
   gpu_info_ = gpu_info.Pass();
   gpu_service_.reset();
diff --git a/components/html_viewer/global_state.h b/components/html_viewer/global_state.h
index 4240e44..e3405f3 100644
--- a/components/html_viewer/global_state.h
+++ b/components/html_viewer/global_state.h
@@ -80,7 +80,7 @@ class GlobalState {
     return &gpu_memory_buffer_manager_;
   }
 
-  const mojo::GpuInfo* GetGpuInfo();
+  const mus::mojom::GpuInfo* GetGpuInfo();
 
   MediaFactory* media_factory() { return media_factory_.get(); }
 
@@ -88,7 +88,7 @@ class GlobalState {
 
  private:
   // Callback for |gpu_service_|->GetGpuInfo().
-  void GetGpuInfoCallback(mojo::GpuInfoPtr gpu_info);
+  void GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info);
 
   // App for HTMLViewer, not the document's app.
   // WARNING: do not expose this. It's too easy to use the wrong one.
@@ -119,8 +119,8 @@ class GlobalState {
   base::Thread compositor_thread_;
   gles2::RasterThreadHelper raster_thread_helper_;
   mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
-  mojo::GpuPtr gpu_service_;
-  mojo::GpuInfoPtr gpu_info_;
+  mus::mojom::GpuPtr gpu_service_;
+  mus::mojom::GpuInfoPtr gpu_info_;
   scoped_ptr<MediaFactory> media_factory_;
 
   BlinkSettings blink_settings_;
diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
index 78f8b22..ce4f1fe 100644
--- a/components/html_viewer/html_document.cc
+++ b/components/html_viewer/html_document.cc
@@ -107,7 +107,7 @@ HTMLDocument::HTMLDocument(mojo::ApplicationImpl* html_document_app,
       factory_(factory) {
   connection->AddService<web_view::mojom::FrameClient>(this);
   connection->AddService<AxProvider>(this);
-  connection->AddService<mojo::ViewTreeClient>(this);
+  connection->AddService<mus::mojom::WindowTreeClient>(this);
   connection->AddService<devtools_service::DevToolsAgent>(this);
   if (IsTestInterfaceEnabled())
     connection->AddService<TestHTMLViewer>(this);
@@ -314,7 +314,7 @@ void HTMLDocument::Create(
 
 void HTMLDocument::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<mojo::ViewTreeClient> request) {
+    mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) {
   DCHECK(!transferable_state_.window_tree_delegate_impl);
   transferable_state_.window_tree_delegate_impl.reset(
       new WindowTreeDelegateImpl(this));
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 2172fb7..8b7aee2 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -55,7 +55,7 @@ class HTMLDocument
       public mojo::InterfaceFactory<web_view::mojom::FrameClient>,
       public mojo::InterfaceFactory<TestHTMLViewer>,
       public mojo::InterfaceFactory<devtools_service::DevToolsAgent>,
-      public mojo::InterfaceFactory<mojo::ViewTreeClient> {
+      public mojo::InterfaceFactory<mus::mojom::WindowTreeClient> {
  public:
   using DeleteCallback = base::Callback<void(HTMLDocument*)>;
 
@@ -136,9 +136,10 @@ class HTMLDocument
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) override;
 
-  // mojo::InterfaceFactory<mus::ViewTreeClient>:
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::ViewTreeClient> request) override;
+  // mojo::InterfaceFactory<mus::WindowTreeClient>:
+  void Create(
+      mojo::ApplicationConnection* connection,
+      mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) override;
 
   scoped_ptr<mojo::AppRefCount> app_refcount_;
   mojo::ApplicationImpl* html_document_app_;
diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc
index d7302be..8bda1d0 100644
--- a/components/html_viewer/html_frame_apptest.cc
+++ b/components/html_viewer/html_frame_apptest.cc
@@ -25,6 +25,7 @@
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h"
 
+using mus::mojom::WindowTreeClientPtr;
 using mus::WindowServerTestBase;
 using web_view::Frame;
 using web_view::FrameConnection;
@@ -226,7 +227,7 @@ class HTMLFrameTest : public WindowServerTestBase {
       return nullptr;
     FrameConnection* result = frame_connection.get();
     FrameClient* frame_client = frame_connection->frame_client();
-    ViewTreeClientPtr tree_client = frame_connection->GetViewTreeClient();
+    WindowTreeClientPtr tree_client = frame_connection->GetWindowTreeClient();
     frame_tree_.reset(new FrameTree(
         result->GetContentHandlerID(), view, tree_client.Pass(),
         frame_tree_delegate_.get(), frame_client, frame_connection.Pass(),
diff --git a/components/html_viewer/html_widget.cc b/components/html_viewer/html_widget.cc
index b1d3217..040b3aa 100644
--- a/components/html_viewer/html_widget.cc
+++ b/components/html_viewer/html_widget.cc
@@ -37,7 +37,7 @@ void InitializeWebLayerTreeView(WebLayerTreeViewImpl* web_layer_tree_view,
   DCHECK(window);
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:mus");
-  mojo::GpuPtr gpu_service;
+  mus::mojom::GpuPtr gpu_service;
   app->ConnectToService(request.Pass(), &gpu_service);
   web_layer_tree_view->Initialize(gpu_service.Pass(), window, widget);
 }
diff --git a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc
index f9e4c5b..b9efa5e 100644
--- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc
+++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.cc
@@ -26,7 +26,7 @@ WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
     const blink::WebGraphicsContext3D::Attributes& attributes,
     blink::WebGraphicsContext3D* share_context,
     blink::WebGLInfo* gl_info) {
-  const mojo::GpuInfo* gpu_info = global_state->GetGpuInfo();
+  const mus::mojom::GpuInfo* gpu_info = global_state->GetGpuInfo();
   gl_info->vendorId = gpu_info->vendor_id;
   gl_info->deviceId = gpu_info->device_id;
   gl_info->vendorInfo = gpu_info->vendor_info.To<blink::WebString>();
@@ -35,16 +35,16 @@ WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
 
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:mus");
-  mojo::GpuPtr gpu_service;
+  mus::mojom::GpuPtr gpu_service;
   app->ConnectToService(request.Pass(), &gpu_service);
-  mojo::CommandBufferPtr cb;
+  mus::mojom::CommandBufferPtr cb;
   gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb));
   return new WebGraphicsContext3DCommandBufferImpl(
       cb.PassInterface(), active_url, attributes, share_context);
 }
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl(
-    mojo::InterfacePtrInfo<mojo::CommandBuffer> command_buffer_info,
+    mojo::InterfacePtrInfo<mus::mojom::CommandBuffer> command_buffer_info,
     const GURL& active_url,
     const blink::WebGraphicsContext3D::Attributes& attributes,
     blink::WebGraphicsContext3D* share_context) {
diff --git a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
index d90d1d6..564f6f4 100644
--- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
+++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
@@ -40,7 +40,7 @@ class WebGraphicsContext3DCommandBufferImpl
 
  private:
   WebGraphicsContext3DCommandBufferImpl(
-      mojo::InterfacePtrInfo<mojo::CommandBuffer> command_buffer_info,
+      mojo::InterfacePtrInfo<mus::mojom::CommandBuffer> command_buffer_info,
       const GURL& active_url,
       const blink::WebGraphicsContext3D::Attributes& attributes,
       blink::WebGraphicsContext3D* share_context);
diff --git a/components/html_viewer/web_layer_tree_view_impl.cc b/components/html_viewer/web_layer_tree_view_impl.cc
index c54081e..066666a 100644
--- a/components/html_viewer/web_layer_tree_view_impl.cc
+++ b/components/html_viewer/web_layer_tree_view_impl.cc
@@ -57,13 +57,13 @@ WebLayerTreeViewImpl::WebLayerTreeViewImpl(
   DCHECK(layer_tree_host_);
 }
 
-void WebLayerTreeViewImpl::Initialize(mojo::GpuPtr gpu_service,
+void WebLayerTreeViewImpl::Initialize(mus::mojom::GpuPtr gpu_service,
                                       mus::Window* window,
                                       blink::WebWidget* widget) {
   window_ = window;
   widget_ = widget;
   if (gpu_service) {
-    mojo::CommandBufferPtr cb;
+    mus::mojom::CommandBufferPtr cb;
     gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb));
     scoped_refptr<cc::ContextProvider> context_provider(
         new mus::ContextProvider(cb.PassInterface().PassHandle()));
diff --git a/components/html_viewer/web_layer_tree_view_impl.h b/components/html_viewer/web_layer_tree_view_impl.h
index 8ca4302..9f4ea27 100644
--- a/components/html_viewer/web_layer_tree_view_impl.h
+++ b/components/html_viewer/web_layer_tree_view_impl.h
@@ -43,7 +43,7 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
       cc::TaskGraphRunner* task_graph_runner);
   ~WebLayerTreeViewImpl() override;
 
-  void Initialize(mojo::GpuPtr gpu_service,
+  void Initialize(mus::mojom::GpuPtr gpu_service,
                   mus::Window* window,
                   blink::WebWidget* widget);