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