Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/omnibox/browser/base_search_provider.h" | 5 #include "components/omnibox/browser/base_search_provider.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/i18n/case_conversion.h" | 10 #include "base/i18n/case_conversion.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 // Immediately update the list of matches to show the match was deleted, | 144 // Immediately update the list of matches to show the match was deleted, |
| 145 // regardless of whether the server request actually succeeds. | 145 // regardless of whether the server request actually succeeds. |
| 146 DeleteMatchFromMatches(match); | 146 DeleteMatchFromMatches(match); |
| 147 } | 147 } |
| 148 | 148 |
| 149 void BaseSearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const { | 149 void BaseSearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const { |
| 150 provider_info->push_back(metrics::OmniboxEventProto_ProviderInfo()); | 150 provider_info->push_back(metrics::OmniboxEventProto_ProviderInfo()); |
| 151 metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back(); | 151 metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back(); |
| 152 new_entry.set_provider(AsOmniboxEventProviderType()); | 152 new_entry.set_provider(AsOmniboxEventProviderType()); |
| 153 new_entry.set_provider_done(done_); | 153 new_entry.set_provider_done(done_); |
| 154 std::vector<uint32_t> field_trial_hashes; | |
| 155 OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(&field_trial_hashes); | |
|
Mark P
2016/01/14 05:31:02
This code cannot be removed because it's part of t
Ilya Sherman
2016/01/14 05:40:41
Done.
| |
| 156 for (size_t i = 0; i < field_trial_hashes.size(); ++i) { | |
| 157 if (field_trial_triggered_) | |
| 158 new_entry.mutable_field_trial_triggered()->Add(field_trial_hashes[i]); | |
| 159 if (field_trial_triggered_in_session_) { | |
| 160 new_entry.mutable_field_trial_triggered_in_session()->Add( | |
| 161 field_trial_hashes[i]); | |
| 162 } | |
| 163 } | |
| 164 } | 154 } |
| 165 | 155 |
| 166 // static | 156 // static |
| 167 const char BaseSearchProvider::kRelevanceFromServerKey[] = | 157 const char BaseSearchProvider::kRelevanceFromServerKey[] = |
| 168 "relevance_from_server"; | 158 "relevance_from_server"; |
| 169 const char BaseSearchProvider::kShouldPrefetchKey[] = "should_prefetch"; | 159 const char BaseSearchProvider::kShouldPrefetchKey[] = "should_prefetch"; |
| 170 const char BaseSearchProvider::kSuggestMetadataKey[] = "suggest_metadata"; | 160 const char BaseSearchProvider::kSuggestMetadataKey[] = "suggest_metadata"; |
| 171 const char BaseSearchProvider::kDeletionUrlKey[] = "deletion_url"; | 161 const char BaseSearchProvider::kDeletionUrlKey[] = "deletion_url"; |
| 172 const char BaseSearchProvider::kTrue[] = "true"; | 162 const char BaseSearchProvider::kTrue[] = "true"; |
| 173 const char BaseSearchProvider::kFalse[] = "false"; | 163 const char BaseSearchProvider::kFalse[] = "false"; |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 480 } | 470 } |
| 481 | 471 |
| 482 void BaseSearchProvider::OnDeletionComplete( | 472 void BaseSearchProvider::OnDeletionComplete( |
| 483 bool success, SuggestionDeletionHandler* handler) { | 473 bool success, SuggestionDeletionHandler* handler) { |
| 484 RecordDeletionResult(success); | 474 RecordDeletionResult(success); |
| 485 SuggestionDeletionHandlers::iterator it = std::find( | 475 SuggestionDeletionHandlers::iterator it = std::find( |
| 486 deletion_handlers_.begin(), deletion_handlers_.end(), handler); | 476 deletion_handlers_.begin(), deletion_handlers_.end(), handler); |
| 487 DCHECK(it != deletion_handlers_.end()); | 477 DCHECK(it != deletion_handlers_.end()); |
| 488 deletion_handlers_.erase(it); | 478 deletion_handlers_.erase(it); |
| 489 } | 479 } |
| OLD | NEW |