| 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> |
| 8 #include <stdint.h> |
| 9 |
| 7 #include "base/i18n/case_conversion.h" | 10 #include "base/i18n/case_conversion.h" |
| 11 #include "base/macros.h" |
| 8 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 10 #include "components/data_use_measurement/core/data_use_user_data.h" | 14 #include "components/data_use_measurement/core/data_use_user_data.h" |
| 11 #include "components/metrics/proto/omnibox_event.pb.h" | 15 #include "components/metrics/proto/omnibox_event.pb.h" |
| 12 #include "components/metrics/proto/omnibox_input_type.pb.h" | 16 #include "components/metrics/proto/omnibox_input_type.pb.h" |
| 13 #include "components/omnibox/browser/autocomplete_provider_client.h" | 17 #include "components/omnibox/browser/autocomplete_provider_client.h" |
| 14 #include "components/omnibox/browser/autocomplete_provider_listener.h" | 18 #include "components/omnibox/browser/autocomplete_provider_listener.h" |
| 15 #include "components/omnibox/browser/omnibox_field_trial.h" | 19 #include "components/omnibox/browser/omnibox_field_trial.h" |
| 16 #include "components/omnibox/browser/suggestion_answer.h" | 20 #include "components/omnibox/browser/suggestion_answer.h" |
| 17 #include "components/search_engines/template_url.h" | 21 #include "components/search_engines/template_url.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 // 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, |
| 141 // regardless of whether the server request actually succeeds. | 145 // regardless of whether the server request actually succeeds. |
| 142 DeleteMatchFromMatches(match); | 146 DeleteMatchFromMatches(match); |
| 143 } | 147 } |
| 144 | 148 |
| 145 void BaseSearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const { | 149 void BaseSearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const { |
| 146 provider_info->push_back(metrics::OmniboxEventProto_ProviderInfo()); | 150 provider_info->push_back(metrics::OmniboxEventProto_ProviderInfo()); |
| 147 metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back(); | 151 metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back(); |
| 148 new_entry.set_provider(AsOmniboxEventProviderType()); | 152 new_entry.set_provider(AsOmniboxEventProviderType()); |
| 149 new_entry.set_provider_done(done_); | 153 new_entry.set_provider_done(done_); |
| 150 std::vector<uint32> field_trial_hashes; | 154 std::vector<uint32_t> field_trial_hashes; |
| 151 OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(&field_trial_hashes); | 155 OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(&field_trial_hashes); |
| 152 for (size_t i = 0; i < field_trial_hashes.size(); ++i) { | 156 for (size_t i = 0; i < field_trial_hashes.size(); ++i) { |
| 153 if (field_trial_triggered_) | 157 if (field_trial_triggered_) |
| 154 new_entry.mutable_field_trial_triggered()->Add(field_trial_hashes[i]); | 158 new_entry.mutable_field_trial_triggered()->Add(field_trial_hashes[i]); |
| 155 if (field_trial_triggered_in_session_) { | 159 if (field_trial_triggered_in_session_) { |
| 156 new_entry.mutable_field_trial_triggered_in_session()->Add( | 160 new_entry.mutable_field_trial_triggered_in_session()->Add( |
| 157 field_trial_hashes[i]); | 161 field_trial_hashes[i]); |
| 158 } | 162 } |
| 159 } | 163 } |
| 160 } | 164 } |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 } | 483 } |
| 480 | 484 |
| 481 void BaseSearchProvider::OnDeletionComplete( | 485 void BaseSearchProvider::OnDeletionComplete( |
| 482 bool success, SuggestionDeletionHandler* handler) { | 486 bool success, SuggestionDeletionHandler* handler) { |
| 483 RecordDeletionResult(success); | 487 RecordDeletionResult(success); |
| 484 SuggestionDeletionHandlers::iterator it = std::find( | 488 SuggestionDeletionHandlers::iterator it = std::find( |
| 485 deletion_handlers_.begin(), deletion_handlers_.end(), handler); | 489 deletion_handlers_.begin(), deletion_handlers_.end(), handler); |
| 486 DCHECK(it != deletion_handlers_.end()); | 490 DCHECK(it != deletion_handlers_.end()); |
| 487 deletion_handlers_.erase(it); | 491 deletion_handlers_.erase(it); |
| 488 } | 492 } |
| OLD | NEW |