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

Side by Side Diff: mojo/common/common_type_converters.cc

Issue 507173003: Change TypeConverter<X,Y>::ConvertFrom and ConvertTo into a single symmetric (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: compile for real Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/common/common_type_converters.h" 5 #include "mojo/common/common_type_converters.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "url/gurl.h" 10 #include "url/gurl.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 13
14 // static 14 // static
15 String TypeConverter<String, base::StringPiece>::ConvertFrom( 15 String TypeConverter<String, base::StringPiece>::Convert(
16 const base::StringPiece& input) { 16 const base::StringPiece& input) {
17 if (input.empty()) { 17 if (input.empty()) {
18 char c = 0; 18 char c = 0;
19 return String(&c, 0); 19 return String(&c, 0);
20 } 20 }
21 return String(input.data(), input.size()); 21 return String(input.data(), input.size());
22 } 22 }
23 // static 23 // static
24 base::StringPiece TypeConverter<String, base::StringPiece>::ConvertTo( 24 base::StringPiece TypeConverter<base::StringPiece, String>::Convert(
25 const String& input) { 25 const String& input) {
26 return input.get(); 26 return input.get();
27 } 27 }
28 28
29 // static 29 // static
30 String TypeConverter<String, base::string16>::ConvertFrom( 30 String TypeConverter<String, base::string16>::Convert(
31 const base::string16& input) { 31 const base::string16& input) {
32 return TypeConverter<String, base::StringPiece>::ConvertFrom( 32 return TypeConverter<String, base::StringPiece>::Convert(
33 base::UTF16ToUTF8(input)); 33 base::UTF16ToUTF8(input));
34 } 34 }
35 // static 35 // static
36 base::string16 TypeConverter<String, base::string16>::ConvertTo( 36 base::string16 TypeConverter<base::string16, String>::Convert(
37 const String& input) { 37 const String& input) {
38 return base::UTF8ToUTF16(TypeConverter<String, base::StringPiece>::ConvertTo( 38 return base::UTF8ToUTF16(input.To<base::StringPiece>());
39 input));
40 } 39 }
41 40
42 String TypeConverter<String, GURL>::ConvertFrom(const GURL& input) { 41 String TypeConverter<String, GURL>::Convert(const GURL& input) {
43 return String(input.spec()); 42 return String(input.spec());
44 } 43 }
45 44
46 GURL TypeConverter<String, GURL>::ConvertTo(const String& input) { 45 GURL TypeConverter<GURL, String>::Convert(const String& input) {
47 return GURL(input.get()); 46 return GURL(input.get());
48 } 47 }
49 48
50 } // namespace mojo 49 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/common/common_type_converters.h ('k') | mojo/examples/pepper_container_app/type_converters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698