components/mus/public/interfaces View => Window

ui/views/mus/surface_binding.cc

 // Copyright 2015 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 "ui/views/mus/surface_binding.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 46 matching lines @@
 
   void Init();
 
   static base::LazyInstance<
       base::ThreadLocalPointer<ConnectionToStateMap>>::Leaky window_states;
 
   mojo::Shell* shell_;
   mus::WindowTreeConnection* connection_;
 
   // Set of state needed to create an OutputSurface.
-  mojo::GpuPtr gpu_;
+  mus::mojom::GpuPtr gpu_;
 
   DISALLOW_COPY_AND_ASSIGN(PerConnectionState);
 };
 
 // static
 base::LazyInstance<base::ThreadLocalPointer<
     SurfaceBinding::PerConnectionState::ConnectionToStateMap>>::Leaky
     SurfaceBinding::PerConnectionState::window_states;
 
 // static
 SurfaceBinding::PerConnectionState* SurfaceBinding::PerConnectionState::Get(
     mojo::Shell* shell,
     mus::WindowTreeConnection* connection) {
   ConnectionToStateMap* window_map = window_states.Pointer()->Get();
   if (!window_map) {
     window_map = new ConnectionToStateMap;
     window_states.Pointer()->Set(window_map);
   }
   if (!(*window_map)[connection]) {
     (*window_map)[connection] = new PerConnectionState(shell, connection);
     (*window_map)[connection]->Init();
   }
   return (*window_map)[connection];
 }
 
 scoped_ptr<cc::OutputSurface>
 SurfaceBinding::PerConnectionState::CreateOutputSurface(mus::Window* window) {
   // TODO(sky): figure out lifetime here. Do I need to worry about the return
   // value outliving this?
-  mojo::CommandBufferPtr cb;
+  mus::mojom::CommandBufferPtr cb;
   gpu_->CreateOffscreenGLES2Context(GetProxy(&cb));
 
   scoped_refptr<cc::ContextProvider> context_provider(
       new mus::ContextProvider(cb.PassInterface().PassHandle()));
   return make_scoped_ptr(
       new mus::OutputSurface(context_provider, window->RequestSurface()));
 }
 
 SurfaceBinding::PerConnectionState::PerConnectionState(
     mojo::Shell* shell,
@@ skipping 27 matching lines @@
     : window_(window),
       state_(PerConnectionState::Get(shell, window->connection())) {}
 
 SurfaceBinding::~SurfaceBinding() {}
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(window_);
 }
 
 }  // namespace views