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

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

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos build Created 6 years, 4 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 | « webkit/common/database/database_identifier.h ('k') | webkit/common/fileapi/directory_entry.h » ('j') | 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
11 namespace webkit_database { 11 namespace storage {
12 12
13 // static 13 // static
14 std::string GetIdentifierFromOrigin(const GURL& origin) { 14 std::string GetIdentifierFromOrigin(const GURL& origin) {
15 return DatabaseIdentifier::CreateFromOrigin(origin).ToString(); 15 return DatabaseIdentifier::CreateFromOrigin(origin).ToString();
16 } 16 }
17 17
18 // static 18 // static
19 GURL GetOriginFromIdentifier(const std::string& identifier) { 19 GURL GetOriginFromIdentifier(const std::string& identifier) {
20 return DatabaseIdentifier::Parse(identifier).ToOrigin(); 20 return DatabaseIdentifier::Parse(identifier).ToOrigin();
21 } 21 }
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 GURL DatabaseIdentifier::ToOrigin() const { 135 GURL DatabaseIdentifier::ToOrigin() const {
136 if (is_file_) 136 if (is_file_)
137 return GURL("file:///"); 137 return GURL("file:///");
138 if (is_unique_) 138 if (is_unique_)
139 return GURL(); 139 return GURL();
140 if (port_ == 0) 140 if (port_ == 0)
141 return GURL(scheme_ + "://" + hostname_); 141 return GURL(scheme_ + "://" + hostname_);
142 return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_)); 142 return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_));
143 } 143 }
144 144
145 } // namespace webkit_database 145 } // namespace storage
OLDNEW
« no previous file with comments | « webkit/common/database/database_identifier.h ('k') | webkit/common/fileapi/directory_entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698