Readd the clipboard service and get it compiling again.

components/mus/mus_app.cc

 // Copyright 2014 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 "components/mus/mus_app.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
+#include "components/mus/clipboard/clipboard_impl.h"
 #include "components/mus/common/switches.h"
 #include "components/mus/gles2/gpu_impl.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/platform_screen.h"
 #include "components/mus/ws/user_display_manager.h"
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_server_test_impl.h"
 #include "components/mus/ws/window_tree.h"
@@ skipping 37 matching lines @@
 
 }  // namespace
 
 // TODO(sky): this is a pretty typical pattern, make it easier to do.
 struct MusApp::PendingRequest {
   shell::Connection* connection;
   std::unique_ptr<mojo::InterfaceRequest<mojom::WindowTreeFactory>> wtf_request;
 };
 
 struct MusApp::UserState {
+  std::unique_ptr<clipboard::ClipboardImpl> clipboard;
   std::unique_ptr<ws::WindowTreeHostFactory> window_tree_host_factory;
 };
 
 MusApp::MusApp()
     : test_config_(false),
       platform_screen_(ws::PlatformScreen::Create()),
       weak_ptr_factory_(this) {}
 
 MusApp::~MusApp() {
   // Destroy |window_server_| first, since it depends on |event_source_|.
@@ skipping 96 matching lines @@
   platform_display_init_params_.gpu_state = new GpuState();
 
   // Gpu must be running before the PlatformScreen can be initialized.
   platform_screen_->Init();
   window_server_.reset(
       new ws::WindowServer(this, platform_display_init_params_.surfaces_state));
 }
 
 bool MusApp::AcceptConnection(Connection* connection) {
   connection->AddInterface<Gpu>(this);
+  connection->AddInterface<mojom::Clipboard>(this);
   connection->AddInterface<mojom::DisplayManager>(this);
   connection->AddInterface<mojom::UserAccessManager>(this);
   connection->AddInterface<WindowTreeHostFactory>(this);
   connection->AddInterface<mojom::WindowManagerFactoryService>(this);
   connection->AddInterface<mojom::WindowTreeFactory>(this);
   if (test_config_)
     connection->AddInterface<WindowServerTest>(this);
   return true;
 }
 
@@ skipping 15 matching lines @@
 }
 
 void MusApp::CreateDefaultDisplays() {
   // An asynchronous callback will create the Displays once the physical
   // displays are ready.
   platform_screen_->ConfigurePhysicalDisplay(base::Bind(
       &MusApp::OnCreatedPhysicalDisplay, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void MusApp::Create(shell::Connection* connection,
+                    mojom::ClipboardRequest request) {
+  UserState* user_state = GetUserState(connection);
+  if (!user_state->clipboard)
+    user_state->clipboard.reset(new clipboard::ClipboardImpl);
+  user_state->clipboard->AddBinding(std::move(request));
+}
+
+void MusApp::Create(shell::Connection* connection,
                     mojom::DisplayManagerRequest request) {
   window_server_->display_manager()
       ->GetUserDisplayManager(connection->GetRemoteIdentity().user_id())
       ->AddDisplayManagerBinding(std::move(request));
 }
 
+void MusApp::Create(shell::Connection* connection, mojom::GpuRequest request) {
+  DCHECK(platform_display_init_params_.gpu_state);
+  new GpuImpl(std::move(request), platform_display_init_params_.gpu_state);
+}
+
 void MusApp::Create(shell::Connection* connection,
                     mojom::UserAccessManagerRequest request) {
   window_server_->user_id_tracker()->Bind(std::move(request));
 }
 
 void MusApp::Create(shell::Connection* connection,
                     mojom::WindowManagerFactoryServiceRequest request) {
   AddUserIfNecessary(connection);
   window_server_->window_manager_factory_registry()->Register(
       connection->GetRemoteIdentity().user_id(), std::move(request));
@@ skipping 28 matching lines @@
   user_state->window_tree_host_factory->AddBinding(std::move(request));
 }
 
 void MusApp::Create(Connection* connection,
                     mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   new ws::WindowServerTestImpl(window_server_.get(), std::move(request));
 }
 
-void MusApp::Create(shell::Connection* connection, mojom::GpuRequest request) {
-  DCHECK(platform_display_init_params_.gpu_state);
-  new GpuImpl(std::move(request), platform_display_init_params_.gpu_state);
-}
-
 void MusApp::OnCreatedPhysicalDisplay(int64_t id, const gfx::Rect& bounds) {
   platform_display_init_params_.display_bounds = bounds;
   platform_display_init_params_.display_id = id;
 
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 }
 
 }  // namespace mus