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

Unified Diff: mojo/embedder/embedder.cc

Issue 623883002: Revert "Move mojo edk into mojo/edk" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « mojo/embedder/embedder.h ('k') | mojo/embedder/embedder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/embedder/embedder.cc
diff --git a/mojo/edk/embedder/embedder.cc b/mojo/embedder/embedder.cc
similarity index 94%
rename from mojo/edk/embedder/embedder.cc
rename to mojo/embedder/embedder.cc
index c41c4f7019afac739cea11d10cfd095f8dfca44a..ca9bcd7d7ae932b56db28c721e201aa74340258b 100644
--- a/mojo/edk/embedder/embedder.cc
+++ b/mojo/embedder/embedder.cc
@@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/entrypoints.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/platform_handle_dispatcher.h"
-#include "mojo/edk/system/raw_channel.h"
+#include "mojo/embedder/platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/core.h"
+#include "mojo/system/entrypoints.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
+#include "mojo/system/raw_channel.h"
namespace mojo {
namespace embedder {
« no previous file with comments | « mojo/embedder/embedder.h ('k') | mojo/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698