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

Side by Side Diff: trunk/src/webkit/common/database/database_identifier.cc

Issue 198163004: Revert 257524 "Move IsStringASCII/UTF8 to base namespace." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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
« no previous file with comments | « trunk/src/ui/base/l10n/l10n_util.cc ('k') | 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 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 "webkit/common/database/database_identifier.h" 5 #include "webkit/common/database/database_identifier.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "url/url_canon.h" 9 #include "url/url_canon.h"
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 return DatabaseIdentifier(origin.scheme(), 50 return DatabaseIdentifier(origin.scheme(),
51 origin.host(), 51 origin.host(),
52 port, 52 port,
53 false /* unique */, 53 false /* unique */,
54 false /* file */); 54 false /* file */);
55 } 55 }
56 56
57 // static 57 // static
58 DatabaseIdentifier DatabaseIdentifier::Parse(const std::string& identifier) { 58 DatabaseIdentifier DatabaseIdentifier::Parse(const std::string& identifier) {
59 if (!base::IsStringASCII(identifier)) 59 if (!IsStringASCII(identifier))
60 return DatabaseIdentifier(); 60 return DatabaseIdentifier();
61 61
62 size_t first_underscore = identifier.find_first_of('_'); 62 size_t first_underscore = identifier.find_first_of('_');
63 if (first_underscore == std::string::npos || first_underscore == 0) 63 if (first_underscore == std::string::npos || first_underscore == 0)
64 return DatabaseIdentifier(); 64 return DatabaseIdentifier();
65 65
66 size_t last_underscore = identifier.find_last_of('_'); 66 size_t last_underscore = identifier.find_last_of('_');
67 if (last_underscore == std::string::npos || 67 if (last_underscore == std::string::npos ||
68 last_underscore == first_underscore || 68 last_underscore == first_underscore ||
69 last_underscore == identifier.length() - 1) 69 last_underscore == identifier.length() - 1)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 if (is_file_) 129 if (is_file_)
130 return GURL("file:///"); 130 return GURL("file:///");
131 if (is_unique_) 131 if (is_unique_)
132 return GURL(); 132 return GURL();
133 if (port_ == 0) 133 if (port_ == 0)
134 return GURL(scheme_ + "://" + hostname_); 134 return GURL(scheme_ + "://" + hostname_);
135 return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_)); 135 return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_));
136 } 136 }
137 137
138 } // namespace webkit_database 138 } // namespace webkit_database
OLDNEW
« no previous file with comments | « trunk/src/ui/base/l10n/l10n_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698