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

Side by Side Diff: services/js/content_handler_main.cc

Issue 703023004: Move the JS content handler et al from mojo/apps/js to mojo/services (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fixed DEPS gl build Created 6 years, 1 month 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/js/DEPS ('k') | services/js/js_app.h » ('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/i18n/icu_util.h" 5 #include "base/i18n/icu_util.h"
6 #include "gin/array_buffer.h" 6 #include "gin/array_buffer.h"
7 #include "gin/public/isolate_holder.h" 7 #include "gin/public/isolate_holder.h"
8 #include "mojo/application/application_runner_chromium.h" 8 #include "mojo/application/application_runner_chromium.h"
9 #include "mojo/application/content_handler_factory.h" 9 #include "mojo/application/content_handler_factory.h"
10 #include "mojo/apps/js/js_app.h"
11 #include "mojo/public/c/system/main.h" 10 #include "mojo/public/c/system/main.h"
12 #include "mojo/public/cpp/application/application_impl.h" 11 #include "mojo/public/cpp/application/application_impl.h"
13 #include "mojo/public/cpp/application/interface_factory_impl.h" 12 #include "mojo/public/cpp/application/interface_factory_impl.h"
13 #include "services/js/js_app.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 namespace apps { 16 namespace js {
17 17
18 class JsContentHandler : public ApplicationDelegate, 18 class JsContentHandler : public ApplicationDelegate,
19 public ContentHandlerFactory::Delegate { 19 public ContentHandlerFactory::Delegate {
20 public: 20 public:
21 JsContentHandler() : content_handler_factory_(this) {} 21 JsContentHandler() : content_handler_factory_(this) {}
22 22
23 private: 23 private:
24 // Overridden from ApplicationDelegate: 24 // Overridden from ApplicationDelegate:
25 void Initialize(ApplicationImpl* app) override { 25 void Initialize(ApplicationImpl* app) override {
26 base::i18n::InitializeICU(); 26 base::i18n::InitializeICU();
(...skipping 12 matching lines...) Expand all
39 ShellPtr shell, 39 ShellPtr shell,
40 URLResponsePtr response) override { 40 URLResponsePtr response) override {
41 return make_scoped_ptr(new JSApp(shell.Pass(), response.Pass())); 41 return make_scoped_ptr(new JSApp(shell.Pass(), response.Pass()));
42 } 42 }
43 43
44 ContentHandlerFactory content_handler_factory_; 44 ContentHandlerFactory content_handler_factory_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(JsContentHandler); 46 DISALLOW_COPY_AND_ASSIGN(JsContentHandler);
47 }; 47 };
48 48
49 } // namespace apps 49 } // namespace js
50 } // namespace mojo 50 } // namespace mojo
51 51
52 MojoResult MojoMain(MojoHandle shell_handle) { 52 MojoResult MojoMain(MojoHandle shell_handle) {
53 mojo::ApplicationRunnerChromium runner(new mojo::apps::JsContentHandler); 53 mojo::ApplicationRunnerChromium runner(new mojo::js::JsContentHandler);
54 return runner.Run(shell_handle); 54 return runner.Run(shell_handle);
55 } 55 }
OLDNEW
« no previous file with comments | « services/js/DEPS ('k') | services/js/js_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698