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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/sky/runtime_flags.cc ('k') | sky/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/sky/viewer.cc
diff --git a/sky/viewer/viewer.cc b/services/sky/viewer.cc
similarity index 91%
rename from sky/viewer/viewer.cc
rename to services/sky/viewer.cc
index 6494bb2a3a2839301c0fd978b10dd134d5b405a1..163aac3b9536e0783247e3774fbb337bd11062fb 100644
--- a/sky/viewer/viewer.cc
+++ b/services/sky/viewer.cc
@@ -14,12 +14,12 @@
#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/content_handler_impl.h"
+#include "services/sky/document_view.h"
+#include "services/sky/runtime_flags.h"
#include "sky/engine/public/web/Sky.h"
#include "sky/engine/public/web/WebRuntimeFeatures.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"
namespace sky {
@@ -35,7 +35,8 @@ class Viewer : public mojo::ApplicationDelegate,
void Initialize(mojo::ApplicationImpl* app) override {
RuntimeFlags::Initialize(app);
- blink::WebRuntimeFeatures::enableObservatory(!RuntimeFlags::Get().testing());
+ blink::WebRuntimeFeatures::enableObservatory(
+ !RuntimeFlags::Get().testing());
mojo::NetworkServicePtr network_service;
app->ConnectToService("mojo:authenticated_network_service",
« 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