| 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 "chrome/common/search_urls.h" | 5 #include "chrome/common/search_urls.h" |
| 6 | 6 |
| 7 #include "content/public/common/url_constants.h" | 7 #include "content/public/common/url_constants.h" |
| 8 #include "net/base/url_constants.h" |
| 8 #include "url/gurl.h" | 9 #include "url/gurl.h" |
| 9 | 10 |
| 10 namespace search { | 11 namespace search { |
| 11 | 12 |
| 12 namespace { | 13 namespace { |
| 13 bool MatchesOrigin(const GURL& my_url, const GURL& other_url) { | 14 bool MatchesOrigin(const GURL& my_url, const GURL& other_url) { |
| 14 return my_url.host() == other_url.host() && | 15 return my_url.host() == other_url.host() && |
| 15 my_url.port() == other_url.port() && | 16 my_url.port() == other_url.port() && |
| 16 (my_url.scheme() == other_url.scheme() || | 17 (my_url.scheme() == other_url.scheme() || |
| 17 (my_url.SchemeIs(content::kHttpsScheme) && | 18 (my_url.SchemeIs(net::kHttpsScheme) && |
| 18 other_url.SchemeIs(content::kHttpScheme))); | 19 other_url.SchemeIs(net::kHttpScheme))); |
| 19 } | 20 } |
| 20 } // namespace | 21 } // namespace |
| 21 | 22 |
| 22 bool MatchesOriginAndPath(const GURL& my_url, const GURL& other_url) { | 23 bool MatchesOriginAndPath(const GURL& my_url, const GURL& other_url) { |
| 23 return MatchesOrigin(my_url, other_url) && my_url.path() == other_url.path(); | 24 return MatchesOrigin(my_url, other_url) && my_url.path() == other_url.path(); |
| 24 } | 25 } |
| 25 | 26 |
| 26 } // namespace search | 27 } // namespace search |
| OLD | NEW |