| Index: services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc
|
| diff --git a/sky/viewer/viewer.cc b/services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc
|
| similarity index 50%
|
| copy from sky/viewer/viewer.cc
|
| copy to services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc
|
| index 51458750ebf336693a875d94b7061235f2f08755..2b15f61e88b695effb66a47dffe0efd63a0eb7ed 100644
|
| --- a/sky/viewer/viewer.cc
|
| +++ b/services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc
|
| @@ -1,15 +1,20 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// 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 "mojo/application/application_runner_chromium.h"
|
| #include "mojo/public/c/system/main.h"
|
| -#include "sky/viewer/content_handler_impl.h"
|
| +#include "mojo/public/cpp/application/application_connection.h"
|
| +#include "mojo/public/cpp/application/application_delegate.h"
|
| +#include "mojo/public/cpp/application/application_impl.h"
|
| +#include "mojo/public/cpp/application/interface_factory_impl.h"
|
| +#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
|
| +#include "services/sky_packaged_app_viewer/content_handler_impl.h"
|
| #include "sky/viewer/sky_viewer_base.h"
|
|
|
| -namespace sky {
|
| +namespace sky_packaged_app_viewer {
|
|
|
| -class Viewer : public SkyViewerBase {
|
| +class Viewer : public sky::SkyViewerBase {
|
| public:
|
| Viewer() {}
|
|
|
| @@ -25,9 +30,9 @@ class Viewer : public SkyViewerBase {
|
| DISALLOW_COPY_AND_ASSIGN(Viewer);
|
| };
|
|
|
| -} // namespace sky
|
| +} // namespace sky_packaged_app_viewer
|
|
|
| MojoResult MojoMain(MojoHandle application_request) {
|
| - mojo::ApplicationRunnerChromium runner(new sky::Viewer);
|
| + mojo::ApplicationRunnerChromium runner(new sky_packaged_app_viewer::Viewer);
|
| return runner.Run(application_request);
|
| }
|
|
|