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

Unified Diff: mojo/edk/js/mojo_runner_delegate.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 2 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: mojo/edk/js/mojo_runner_delegate.cc
diff --git a/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.cc b/mojo/edk/js/mojo_runner_delegate.cc
similarity index 81%
copy from third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.cc
copy to mojo/edk/js/mojo_runner_delegate.cc
index e95d9957d5f4801ac82073934299ed5fe1852092..9b18b55d2bf371c4bf9105215838635533d5619b 100644
--- a/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.cc
+++ b/mojo/edk/js/mojo_runner_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h"
+#include "mojo/edk/js/mojo_runner_delegate.h"
#include "base/bind.h"
#include "base/path_service.h"
@@ -11,13 +11,13 @@
#include "gin/modules/module_registry.h"
#include "gin/modules/timer.h"
#include "gin/try_catch.h"
-#include "third_party/mojo/src/mojo/edk/js/core.h"
-#include "third_party/mojo/src/mojo/edk/js/handle.h"
-#include "third_party/mojo/src/mojo/edk/js/support.h"
-#include "third_party/mojo/src/mojo/edk/js/threading.h"
+#include "mojo/edk/js/core.h"
+#include "mojo/edk/js/handle.h"
+#include "mojo/edk/js/support.h"
+#include "mojo/edk/js/threading.h"
namespace mojo {
-namespace js {
+namespace edk {
namespace {
@@ -49,9 +49,9 @@ MojoRunnerDelegate::MojoRunnerDelegate()
: ModuleRunnerDelegate(GetModuleSearchPaths()) {
AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule);
AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule);
- AddBuiltinModule(js::Core::kModuleName, js::Core::GetModule);
- AddBuiltinModule(js::Support::kModuleName, js::Support::GetModule);
- AddBuiltinModule(js::Threading::kModuleName, js::Threading::GetModule);
+ AddBuiltinModule(Core::kModuleName, Core::GetModule);
+ AddBuiltinModule(Support::kModuleName, Support::GetModule);
+ AddBuiltinModule(Threading::kModuleName, Threading::GetModule);
}
MojoRunnerDelegate::~MojoRunnerDelegate() {
@@ -74,5 +74,5 @@ void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner,
LOG(ERROR) << try_catch.GetStackTrace();
}
-} // namespace js
+} // namespace edk
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698