| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/instant_types.h" | 5 #include "chrome/common/instant_types.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "net/base/escape.h" | 8 #include "net/base/escape.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 const char kSearchQueryKey[] = "q"; | 85 const char kSearchQueryKey[] = "q"; |
| 86 const char kOriginalQueryKey[] = "oq"; | 86 const char kOriginalQueryKey[] = "oq"; |
| 87 const char kRLZParameterKey[] = "rlz"; | 87 const char kRLZParameterKey[] = "rlz"; |
| 88 const char kInputEncodingKey[] = "ie"; | 88 const char kInputEncodingKey[] = "ie"; |
| 89 const char kAssistedQueryStatsKey[] = "aqs"; | 89 const char kAssistedQueryStatsKey[] = "aqs"; |
| 90 | 90 |
| 91 EmbeddedSearchRequestParams::EmbeddedSearchRequestParams() { | 91 EmbeddedSearchRequestParams::EmbeddedSearchRequestParams() { |
| 92 } | 92 } |
| 93 | 93 |
| 94 EmbeddedSearchRequestParams::EmbeddedSearchRequestParams(const GURL& url) { | 94 EmbeddedSearchRequestParams::EmbeddedSearchRequestParams(const GURL& url) { |
| 95 const std::string& url_params(url.query()); | 95 const std::string& url_params(url.ref().empty()? url.query() : url.ref()); |
| 96 url::Component query, key, value; | 96 url::Component query, key, value; |
| 97 query.len = static_cast<int>(url_params.size()); | 97 query.len = static_cast<int>(url_params.size()); |
| 98 | 98 |
| 99 const net::UnescapeRule::Type unescape_rules = | 99 const net::UnescapeRule::Type unescape_rules = |
| 100 net::UnescapeRule::CONTROL_CHARS | net::UnescapeRule::SPACES | | 100 net::UnescapeRule::CONTROL_CHARS | net::UnescapeRule::SPACES | |
| 101 net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::NORMAL | | 101 net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::NORMAL | |
| 102 net::UnescapeRule::REPLACE_PLUS_WITH_SPACE; | 102 net::UnescapeRule::REPLACE_PLUS_WITH_SPACE; |
| 103 | 103 |
| 104 while (url::ExtractQueryKeyValue(url_params.c_str(), &query, &key, &value)) { | 104 while (url::ExtractQueryKeyValue(url_params.c_str(), &query, &key, &value)) { |
| 105 if (!key.is_nonempty()) | 105 if (!key.is_nonempty()) |
| (...skipping 15 matching lines...) Expand all Loading... |
| 121 value_param, net::UnescapeRule::NORMAL); | 121 value_param, net::UnescapeRule::NORMAL); |
| 122 } else if (key_param == kAssistedQueryStatsKey) { | 122 } else if (key_param == kAssistedQueryStatsKey) { |
| 123 assisted_query_stats = net::UnescapeAndDecodeUTF8URLComponent( | 123 assisted_query_stats = net::UnescapeAndDecodeUTF8URLComponent( |
| 124 value_param, net::UnescapeRule::NORMAL); | 124 value_param, net::UnescapeRule::NORMAL); |
| 125 } | 125 } |
| 126 } | 126 } |
| 127 } | 127 } |
| 128 | 128 |
| 129 EmbeddedSearchRequestParams::~EmbeddedSearchRequestParams() { | 129 EmbeddedSearchRequestParams::~EmbeddedSearchRequestParams() { |
| 130 } | 130 } |
| OLD | NEW |