| Index: sky/viewer/viewer.cc
|
| diff --git a/sky/viewer/viewer.cc b/sky/viewer/viewer.cc
|
| index 2461fa6f05e4692278b80c055bdf8a02ff26b4fb..51458750ebf336693a875d94b7061235f2f08755 100644
|
| --- a/sky/viewer/viewer.cc
|
| +++ b/sky/viewer/viewer.cc
|
| @@ -2,62 +2,26 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/files/file_path.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/threading/thread.h"
|
| #include "mojo/application/application_runner_chromium.h"
|
| -#include "mojo/common/tracing_impl.h"
|
| -#include "mojo/icu/icu.h"
|
| #include "mojo/public/c/system/main.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 "sky/engine/public/web/Sky.h"
|
| -#include "sky/services/platform/platform_impl.h"
|
| #include "sky/viewer/content_handler_impl.h"
|
| -#include "sky/viewer/document_view.h"
|
| -#include "sky/viewer/runtime_flags.h"
|
| +#include "sky/viewer/sky_viewer_base.h"
|
|
|
| namespace sky {
|
|
|
| -class Viewer : public mojo::ApplicationDelegate,
|
| - public mojo::InterfaceFactory<mojo::ContentHandler> {
|
| +class Viewer : public SkyViewerBase {
|
| public:
|
| Viewer() {}
|
|
|
| - ~Viewer() override { blink::shutdown(); }
|
| + ~Viewer() override {}
|
|
|
| private:
|
| - // Overridden from ApplicationDelegate:
|
| - void Initialize(mojo::ApplicationImpl* app) override {
|
| - RuntimeFlags::Initialize(app);
|
| -
|
| - mojo::NetworkServicePtr network_service;
|
| - app->ConnectToService("mojo:network_service", &network_service);
|
| - platform_impl_.reset(new PlatformImpl(network_service.Pass()));
|
| - blink::initialize(platform_impl_.get());
|
| -
|
| - mojo::icu::Initialize(app);
|
| - tracing_.Initialize(app);
|
| - }
|
| -
|
| - bool ConfigureIncomingConnection(
|
| - mojo::ApplicationConnection* connection) override {
|
| - connection->AddService<mojo::ContentHandler>(this);
|
| - return true;
|
| - }
|
| -
|
| // Overridden from InterfaceFactory<ContentHandler>
|
| void Create(mojo::ApplicationConnection* connection,
|
| mojo::InterfaceRequest<mojo::ContentHandler> request) override {
|
| new ContentHandlerImpl(request.Pass());
|
| }
|
|
|
| - scoped_ptr<PlatformImpl> platform_impl_;
|
| - mojo::TracingImpl tracing_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(Viewer);
|
| };
|
|
|
|
|