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

Side by Side Diff: services/sky/viewer.cc

Issue 1235093002: Move sky_viewer into services/sky (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: again Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « services/sky/runtime_flags.cc ('k') | sky/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/threading/thread.h" 7 #include "base/threading/thread.h"
8 #include "mojo/application/application_runner_chromium.h" 8 #include "mojo/application/application_runner_chromium.h"
9 #include "mojo/common/tracing_impl.h" 9 #include "mojo/common/tracing_impl.h"
10 #include "mojo/icu/icu.h" 10 #include "mojo/icu/icu.h"
11 #include "mojo/public/c/system/main.h" 11 #include "mojo/public/c/system/main.h"
12 #include "mojo/public/cpp/application/application_connection.h" 12 #include "mojo/public/cpp/application/application_connection.h"
13 #include "mojo/public/cpp/application/application_delegate.h" 13 #include "mojo/public/cpp/application/application_delegate.h"
14 #include "mojo/public/cpp/application/application_impl.h" 14 #include "mojo/public/cpp/application/application_impl.h"
15 #include "mojo/public/cpp/application/interface_factory_impl.h" 15 #include "mojo/public/cpp/application/interface_factory_impl.h"
16 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 16 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
17 #include "services/sky/content_handler_impl.h"
18 #include "services/sky/document_view.h"
19 #include "services/sky/runtime_flags.h"
17 #include "sky/engine/public/web/Sky.h" 20 #include "sky/engine/public/web/Sky.h"
18 #include "sky/engine/public/web/WebRuntimeFeatures.h" 21 #include "sky/engine/public/web/WebRuntimeFeatures.h"
19 #include "sky/services/platform/platform_impl.h" 22 #include "sky/services/platform/platform_impl.h"
20 #include "sky/viewer/content_handler_impl.h"
21 #include "sky/viewer/document_view.h"
22 #include "sky/viewer/runtime_flags.h"
23 23
24 namespace sky { 24 namespace sky {
25 25
26 class Viewer : public mojo::ApplicationDelegate, 26 class Viewer : public mojo::ApplicationDelegate,
27 public mojo::InterfaceFactory<mojo::ContentHandler> { 27 public mojo::InterfaceFactory<mojo::ContentHandler> {
28 public: 28 public:
29 Viewer() {} 29 Viewer() {}
30 30
31 ~Viewer() override { blink::shutdown(); } 31 ~Viewer() override { blink::shutdown(); }
32 32
33 private: 33 private:
34 // Overridden from ApplicationDelegate: 34 // Overridden from ApplicationDelegate:
35 void Initialize(mojo::ApplicationImpl* app) override { 35 void Initialize(mojo::ApplicationImpl* app) override {
36 RuntimeFlags::Initialize(app); 36 RuntimeFlags::Initialize(app);
37 37
38 blink::WebRuntimeFeatures::enableObservatory(!RuntimeFlags::Get().testing()) ; 38 blink::WebRuntimeFeatures::enableObservatory(
39 !RuntimeFlags::Get().testing());
39 40
40 mojo::NetworkServicePtr network_service; 41 mojo::NetworkServicePtr network_service;
41 app->ConnectToService("mojo:authenticated_network_service", 42 app->ConnectToService("mojo:authenticated_network_service",
42 &network_service); 43 &network_service);
43 platform_impl_.reset(new PlatformImpl(network_service.Pass())); 44 platform_impl_.reset(new PlatformImpl(network_service.Pass()));
44 blink::initialize(platform_impl_.get()); 45 blink::initialize(platform_impl_.get());
45 46
46 mojo::icu::Initialize(app); 47 mojo::icu::Initialize(app);
47 tracing_.Initialize(app); 48 tracing_.Initialize(app);
48 } 49 }
(...skipping 15 matching lines...) Expand all
64 65
65 DISALLOW_COPY_AND_ASSIGN(Viewer); 66 DISALLOW_COPY_AND_ASSIGN(Viewer);
66 }; 67 };
67 68
68 } // namespace sky 69 } // namespace sky
69 70
70 MojoResult MojoMain(MojoHandle application_request) { 71 MojoResult MojoMain(MojoHandle application_request) {
71 mojo::ApplicationRunnerChromium runner(new sky::Viewer); 72 mojo::ApplicationRunnerChromium runner(new sky::Viewer);
72 return runner.Run(application_request); 73 return runner.Run(application_request);
73 } 74 }
OLDNEW
« no previous file with comments | « services/sky/runtime_flags.cc ('k') | sky/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698