| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "sky/viewer/converters/basic_types.h" | 5 #include "services/sky/converters/basic_types.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/bindings/string.h" | 7 #include "mojo/public/cpp/bindings/string.h" |
| 8 #include "sky/engine/public/platform/WebString.h" | 8 #include "sky/engine/public/platform/WebString.h" |
| 9 | 9 |
| 10 using blink::WebString; | 10 using blink::WebString; |
| 11 | 11 |
| 12 namespace mojo { | 12 namespace mojo { |
| 13 | 13 |
| 14 // static | 14 // static |
| 15 String TypeConverter<String, WebString>::Convert(const WebString& str) { | 15 String TypeConverter<String, WebString>::Convert(const WebString& str) { |
| 16 return String(str.utf8()); | 16 return String(str.utf8()); |
| 17 } | 17 } |
| 18 | 18 |
| 19 // static | 19 // static |
| 20 WebString TypeConverter<WebString, String>::Convert(const String& str) { | 20 WebString TypeConverter<WebString, String>::Convert(const String& str) { |
| 21 return WebString::fromUTF8(str.get()); | 21 return WebString::fromUTF8(str.get()); |
| 22 } | 22 } |
| 23 | 23 |
| 24 } // namespace mojo | 24 } // namespace mojo |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1235093002:
Move sky_viewer into services/sky (Closed)
Base URL: git@github.com:domokit/mojo.git@master