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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/slave_info.h

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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: third_party/mojo/src/mojo/edk/embedder/slave_info.h
diff --git a/components/view_manager/public/cpp/keys.cc b/third_party/mojo/src/mojo/edk/embedder/slave_info.h
similarity index 51%
copy from components/view_manager/public/cpp/keys.cc
copy to third_party/mojo/src/mojo/edk/embedder/slave_info.h
index 4a2af70bed0987e8d413ede110dc3bc29c7a897a..8e4295e199628c20531fb5ba04641097bc75e2b8 100644
--- a/components/view_manager/public/cpp/keys.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/slave_info.h
@@ -2,11 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/view_manager/public/cpp/keys.h"
+#ifndef MOJO_EDK_EMBEDDER_SLAVE_INFO_H_
+#define MOJO_EDK_EMBEDDER_SLAVE_INFO_H_
namespace mojo {
+namespace embedder {
-extern const char kViewManagerKeyWantsTouchEvents[] =
- "view-manager-key-wants-touch-events";
+using SlaveInfo = void*;
+} // namespace embedder
} // namespace mojo
+
+#endif // MOJO_EDK_EMBEDDER_SLAVE_INFO_H_
« no previous file with comments | « third_party/mojo/src/mojo/edk/embedder/process_type.h ('k') | third_party/mojo/src/mojo/edk/embedder/test_embedder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698