| OLD | NEW |
| 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 "googleurl/src/url_canon.h" | 9 #include "url/url_canon.h" |
| 10 | 10 |
| 11 namespace webkit_database { | 11 namespace webkit_database { |
| 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) { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |