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

Unified Diff: mojo/converters/base/base_type_converters.cc

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 9 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/converters/base/base_type_converters.h ('k') | mojo/converters/base/base_type_converters_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/converters/base/base_type_converters.cc
diff --git a/mojo/common/common_type_converters.cc b/mojo/converters/base/base_type_converters.cc
similarity index 61%
rename from mojo/common/common_type_converters.cc
rename to mojo/converters/base/base_type_converters.cc
index b656acfc445aac9fb7cef4e1bee8ac88e3d1c097..d4649ce8a5867d367a676e3a288393f6bd736eaf 100644
--- a/mojo/common/common_type_converters.cc
+++ b/mojo/converters/base/base_type_converters.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/common/common_type_converters.h"
+#include "mojo/converters/base/base_type_converters.h"
#include <string>
@@ -37,20 +37,4 @@ base::string16 TypeConverter<base::string16, String>::Convert(
return base::UTF8ToUTF16(input.To<base::StringPiece>());
}
-std::string TypeConverter<std::string, Array<uint8_t> >::Convert(
- const Array<uint8_t>& input) {
- if (input.is_null())
- return std::string();
-
- return std::string(reinterpret_cast<const char*>(&input.front()),
- input.size());
-}
-
-Array<uint8_t> TypeConverter<Array<uint8_t>, std::string>::Convert(
- const std::string& input) {
- Array<uint8_t> result(input.size());
- memcpy(&result.front(), input.c_str(), input.size());
- return result.Pass();
-}
-
} // namespace mojo
« no previous file with comments | « mojo/converters/base/base_type_converters.h ('k') | mojo/converters/base/base_type_converters_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698