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

Side by Side Diff: mojo/apps/js/mojo_runner_delegate.cc

Issue 690743003: Move mojo/bindings/js to mojo/edk/js (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "mojo/apps/js/mojo_runner_delegate.h" 5 #include "mojo/apps/js/mojo_runner_delegate.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "gin/converter.h" 9 #include "gin/converter.h"
10 #include "gin/modules/console.h" 10 #include "gin/modules/console.h"
11 #include "gin/modules/module_registry.h" 11 #include "gin/modules/module_registry.h"
12 #include "gin/modules/timer.h" 12 #include "gin/modules/timer.h"
13 #include "gin/try_catch.h" 13 #include "gin/try_catch.h"
14 #include "mojo/apps/js/bindings/gl/module.h" 14 #include "mojo/apps/js/bindings/gl/module.h"
15 #include "mojo/apps/js/bindings/monotonic_clock.h" 15 #include "mojo/apps/js/bindings/monotonic_clock.h"
16 #include "mojo/apps/js/bindings/threading.h" 16 #include "mojo/apps/js/bindings/threading.h"
17 #include "mojo/bindings/js/core.h" 17 #include "mojo/edk/js/core.h"
18 #include "mojo/bindings/js/handle.h" 18 #include "mojo/edk/js/handle.h"
19 #include "mojo/bindings/js/support.h" 19 #include "mojo/edk/js/support.h"
20 20
21 namespace mojo { 21 namespace mojo {
22 namespace apps { 22 namespace apps {
23 23
24 namespace { 24 namespace {
25 25
26 // TODO(abarth): Rather than loading these modules from the file system, we 26 // TODO(abarth): Rather than loading these modules from the file system, we
27 // should load them from the network via Mojo IPC. 27 // should load them from the network via Mojo IPC.
28 std::vector<base::FilePath> GetModuleSearchPaths() { 28 std::vector<base::FilePath> GetModuleSearchPaths() {
29 std::vector<base::FilePath> search_paths(2); 29 std::vector<base::FilePath> search_paths(2);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 74
75 void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner, 75 void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner,
76 gin::TryCatch& try_catch) { 76 gin::TryCatch& try_catch) {
77 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); 77 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch);
78 LOG(ERROR) << try_catch.GetStackTrace(); 78 LOG(ERROR) << try_catch.GetStackTrace();
79 } 79 }
80 80
81 } // namespace apps 81 } // namespace apps
82 } // namespace mojo 82 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698