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

Side by Side Diff: chrome/browser/net/browser_url_util.cc

Issue 342031: Mailto links should not include mailto: when copying to the clipboard.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/browser/net/browser_url_util.h" 5 #include "chrome/browser/net/browser_url_util.h"
6 6
7 #include "app/clipboard/scoped_clipboard_writer.h" 7 #include "app/clipboard/scoped_clipboard_writer.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "chrome/common/url_constants.h"
9 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
10 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
11 12
12 namespace chrome_browser_net { 13 namespace chrome_browser_net {
13 14
14 void WriteURLToClipboard(const GURL& url, 15 void WriteURLToClipboard(const GURL& url,
15 const std::wstring& languages, 16 const std::wstring& languages,
16 Clipboard *clipboard) { 17 Clipboard *clipboard) {
17 if (url.is_empty() || !url.is_valid() || !clipboard) 18 if (url.is_empty() || !url.is_valid() || !clipboard)
18 return; 19 return;
19 20
20 // Unescaping path and query is not a good idea because other applications 21 // Unescaping path and query is not a good idea because other applications
21 // may not encode non-ASCII characters in UTF-8. See crbug.com/2820. 22 // may not encode non-ASCII characters in UTF-8. See crbug.com/2820.
22 string16 text = WideToUTF16(net::FormatUrl(url, languages, false, 23 string16 text = url.SchemeIs(chrome::kMailToScheme) ?
24 ASCIIToUTF16(url.path()) :
25 WideToUTF16(net::FormatUrl(url, languages, false,
23 UnescapeRule::NONE, NULL, NULL)); 26 UnescapeRule::NONE, NULL, NULL));
24 27
25 ScopedClipboardWriter scw(clipboard); 28 ScopedClipboardWriter scw(clipboard);
26 scw.WriteURL(text); 29 scw.WriteURL(text);
27 } 30 }
28 31
29 } // namespace chrome_browser_net 32 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698