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

Side by Side Diff: content/renderer/clipboard_utils.cc

Issue 1259673002: Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 "content/renderer/clipboard_utils.h" 5 #include "content/renderer/clipboard_utils.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "net/base/escape.h" 8 #include "net/base/escape.h"
9 #include "third_party/WebKit/public/platform/WebString.h" 9 #include "third_party/WebKit/public/platform/WebString.h"
10 #include "third_party/WebKit/public/platform/WebURL.h" 10 #include "third_party/WebKit/public/platform/WebURL.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 std::string URLToMarkup(const blink::WebURL& url, 14 std::string URLToMarkup(const blink::WebURL& url,
15 const blink::WebString& title) { 15 const blink::WebString& title) {
16 std::string markup("<a href=\""); 16 std::string markup("<a href=\"");
17 markup.append(url.spec()); 17 markup.append(url.spec());
18 markup.append("\">"); 18 markup.append("\">");
19 // TODO(darin): HTML escape this 19 // TODO(darin): HTML escape this
20 markup.append(net::EscapeForHTML(base::UTF16ToUTF8(title))); 20 markup.append(
21 net::EscapeForHTML(base::UTF16ToUTF8(base::StringPiece16(title))));
21 markup.append("</a>"); 22 markup.append("</a>");
22 return markup; 23 return markup;
23 } 24 }
24 25
25 std::string URLToImageMarkup(const blink::WebURL& url, 26 std::string URLToImageMarkup(const blink::WebURL& url,
26 const blink::WebString& title) { 27 const blink::WebString& title) {
27 std::string markup("<img src=\""); 28 std::string markup("<img src=\"");
28 markup.append(net::EscapeForHTML(url.spec())); 29 markup.append(net::EscapeForHTML(url.spec()));
29 markup.append("\""); 30 markup.append("\"");
30 if (!title.isEmpty()) { 31 if (!title.isEmpty()) {
31 markup.append(" alt=\""); 32 markup.append(" alt=\"");
32 markup.append(net::EscapeForHTML(base::UTF16ToUTF8(title))); 33 markup.append(
34 net::EscapeForHTML(base::UTF16ToUTF8(base::StringPiece16(title))));
33 markup.append("\""); 35 markup.append("\"");
34 } 36 }
35 markup.append("/>"); 37 markup.append("/>");
36 return markup; 38 return markup;
37 } 39 }
38 40
39 } // namespace content 41 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/cache_storage/cache_storage_dispatcher.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698