OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mojo/shell/identity.h" | 5 #include "mojo/shell/identity.h" |
6 | 6 |
7 #include "mojo/shell/query_util.h" | 7 #include "mojo/shell/query_util.h" |
8 | 8 |
9 namespace mojo { | 9 namespace mojo { |
10 namespace shell { | 10 namespace shell { |
11 | 11 |
12 Identity::Identity(const GURL& url, const std::string& qualifier) | 12 Identity::Identity(const GURL& url, const std::string& qualifier) |
13 : url(GetBaseURLAndQuery(url, nullptr)), qualifier(qualifier) { | 13 : url(GetBaseURLAndQuery(url, nullptr)), |
| 14 qualifier(qualifier.empty() ? url.spec() : qualifier) { |
14 } | 15 } |
15 | 16 |
16 // explicit | 17 // explicit |
17 Identity::Identity(const GURL& base_url) | 18 Identity::Identity(const GURL& base_url) |
18 : url(GetBaseURLAndQuery(base_url, nullptr)), qualifier(url.spec()) { | 19 : url(GetBaseURLAndQuery(base_url, nullptr)), qualifier(url.spec()) { |
19 } | 20 } |
20 | 21 |
21 bool Identity::operator<(const Identity& other) const { | 22 bool Identity::operator<(const Identity& other) const { |
22 if (url != other.url) | 23 if (url != other.url) |
23 return url < other.url; | 24 return url < other.url; |
24 return qualifier < other.qualifier; | 25 return qualifier < other.qualifier; |
25 } | 26 } |
26 | 27 |
27 } // namespace shell | 28 } // namespace shell |
28 } // namespace mojo | 29 } // namespace mojo |
OLD | NEW |