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

Unified Diff: sky/engine/tonic/dart_converter.cc

Issue 924593002: Merge the tonic layer from skydart branch back to master (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix Created 5 years, 10 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 | « sky/engine/tonic/dart_converter.h ('k') | sky/engine/tonic/dart_error.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/tonic/dart_converter.cc
diff --git a/build/android/pylib/remote/device/dummy/src/org/chromium/dummy/Dummy.java b/sky/engine/tonic/dart_converter.cc
similarity index 52%
copy from build/android/pylib/remote/device/dummy/src/org/chromium/dummy/Dummy.java
copy to sky/engine/tonic/dart_converter.cc
index 1281b39586e399c3103b5f2ab3ca1f3fab26d182..3ba7a69afbddfd20a4ea062b3149ed7e6e057e28 100644
--- a/build/android/pylib/remote/device/dummy/src/org/chromium/dummy/Dummy.java
+++ b/sky/engine/tonic/dart_converter.cc
@@ -2,8 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.dummy;
-
-/** Does nothing. */
-class Dummy {}
+#include "sky/engine/config.h"
+#include "sky/engine/tonic/dart_converter.h"
+// This file exists to ensure dart_converter.h doesn't miss any dependencies.
« no previous file with comments | « sky/engine/tonic/dart_converter.h ('k') | sky/engine/tonic/dart_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698