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

Side by Side Diff: third_party/mozilla/NSString+Utils.mm

Issue 18919005: Migrate from googleurl/ includes to url/ ones in the remaining top-level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make googleurl a temp include rule - to prevent others including it again Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 21 matching lines...) Expand all
32 * decision by deleting the provisions above and replace them with the notice 32 * decision by deleting the provisions above and replace them with the notice
33 * and other provisions required by the GPL or the LGPL. If you do not delete 33 * and other provisions required by the GPL or the LGPL. If you do not delete
34 * the provisions above, a recipient may use your version of this file under 34 * the provisions above, a recipient may use your version of this file under
35 * the terms of any one of the MPL, the GPL or the LGPL. 35 * the terms of any one of the MPL, the GPL or the LGPL.
36 * 36 *
37 * ***** END LICENSE BLOCK ***** */ 37 * ***** END LICENSE BLOCK ***** */
38 38
39 #import <AppKit/AppKit.h> // for NSStringDrawing.h 39 #import <AppKit/AppKit.h> // for NSStringDrawing.h
40 40
41 #import "NSString+Utils.h" 41 #import "NSString+Utils.h"
42 #include "googleurl/src/gurl.h" 42 #include "url/gurl.h"
43 43
44 44
45 @implementation NSString (ChimeraStringUtils) 45 @implementation NSString (ChimeraStringUtils)
46 46
47 + (id)ellipsisString 47 + (id)ellipsisString
48 { 48 {
49 static NSString* sEllipsisString = nil; 49 static NSString* sEllipsisString = nil;
50 if (!sEllipsisString) { 50 if (!sEllipsisString) {
51 unichar ellipsisChar = 0x2026; 51 unichar ellipsisChar = 0x2026;
52 sEllipsisString = [[NSString alloc] initWithCharacters:&ellipsisChar length: 1]; 52 sEllipsisString = [[NSString alloc] initWithCharacters:&ellipsisChar length: 1];
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 - (NSString*)unescapedURI 354 - (NSString*)unescapedURI
355 { 355 {
356 NSString *unescapedURI = (NSString*)CFURLCreateStringByReplacingPercentEscapes UsingEncoding(kCFAllocatorDefault, 356 NSString *unescapedURI = (NSString*)CFURLCreateStringByReplacingPercentEscapes UsingEncoding(kCFAllocatorDefault,
357 (CFS tringRef)self, 357 (CFS tringRef)self,
358 CFST R(" \"\';/?:@&=+$,#"), 358 CFST R(" \"\';/?:@&=+$,#"),
359 kCFS tringEncodingUTF8); 359 kCFS tringEncodingUTF8);
360 return unescapedURI ? [unescapedURI autorelease] : self; 360 return unescapedURI ? [unescapedURI autorelease] : self;
361 } 361 }
362 362
363 @end 363 @end
OLDNEW
« no previous file with comments | « sync/test/accounts_client/test_accounts_client_unittest.cc ('k') | ui/base/dragdrop/os_exchange_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698