| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/base_paths.h" | 6 #include "base/base_paths.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 mojo::ApplicationConnection* connection) override { | 27 mojo::ApplicationConnection* connection) override { |
| 28 connection->AddService(this); | 28 connection->AddService(this); |
| 29 return true; | 29 return true; |
| 30 } | 30 } |
| 31 | 31 |
| 32 // mojo::InterfaceFactory<mojo::Clipboard> implementation. | 32 // mojo::InterfaceFactory<mojo::Clipboard> implementation. |
| 33 void Create(mojo::ApplicationConnection* connection, | 33 void Create(mojo::ApplicationConnection* connection, |
| 34 mojo::InterfaceRequest<mojo::Clipboard> request) override { | 34 mojo::InterfaceRequest<mojo::Clipboard> request) override { |
| 35 // TODO(erg): Write native implementations of the clipboard. For now, we | 35 // TODO(erg): Write native implementations of the clipboard. For now, we |
| 36 // just build a clipboard which doesn't interact with the system. | 36 // just build a clipboard which doesn't interact with the system. |
| 37 mojo::BindToRequest(new mojo::ClipboardStandaloneImpl(), &request); | 37 mojo::BindToRequest(new services::ClipboardStandaloneImpl(), &request); |
| 38 } | 38 } |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 MojoResult MojoMain(MojoHandle shell_handle) { | 41 MojoResult MojoMain(MojoHandle shell_handle) { |
| 42 mojo::ApplicationRunnerChromium runner(new Delegate); | 42 mojo::ApplicationRunnerChromium runner(new Delegate); |
| 43 return runner.Run(shell_handle); | 43 return runner.Run(shell_handle); |
| 44 } | 44 } |
| OLD | NEW |