Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(554)

Unified Diff: services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc

Issue 1085853002: Introduce Sky packaged apps. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Switch to using local http server Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 54%
copy from sky/viewer/viewer.cc
copy to services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc
index 2461fa6f05e4692278b80c055bdf8a02ff26b4fb..84bc2e3e1a06c2b2b995e43f23b7235f1ad39b3d 100644
--- a/sky/viewer/viewer.cc
+++ b/services/sky_packaged_app_viewer/sky_packaged_app_viewer.cc
@@ -1,47 +1,28 @@
-// 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 "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 "services/sky_packaged_app_viewer/content_handler_impl.h"
-namespace sky {
+namespace sky_packaged_app_viewer {
class Viewer : public mojo::ApplicationDelegate,
public mojo::InterfaceFactory<mojo::ContentHandler> {
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);
- }
+ void Initialize(mojo::ApplicationImpl* app) override {}
bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) override {
@@ -55,15 +36,12 @@ class Viewer : public mojo::ApplicationDelegate,
new ContentHandlerImpl(request.Pass());
}
- scoped_ptr<PlatformImpl> platform_impl_;
- mojo::TracingImpl tracing_;
-
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);
}

Powered by Google App Engine
This is Rietveld 408576698