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 "components/autofill/core/browser/autofill_external_delegate.h" | 5 #include "components/autofill/core/browser/autofill_external_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/metrics/sparse_histogram.h" | 10 #include "base/metrics/sparse_histogram.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
154 | 154 |
155 if (values.empty()) { | 155 if (values.empty()) { |
156 // No suggestions, any popup currently showing is obsolete. | 156 // No suggestions, any popup currently showing is obsolete. |
157 manager_->client()->HideAutofillPopup(); | 157 manager_->client()->HideAutofillPopup(); |
158 return; | 158 return; |
159 } | 159 } |
160 | 160 |
161 // Send to display. | 161 // Send to display. |
162 if (query_field_.is_focusable) { | 162 if (query_field_.is_focusable) { |
163 manager_->client()->ShowAutofillPopup(element_bounds_, | 163 manager_->client()->ShowAutofillPopup(element_bounds_, |
164 query_field_.text_direction, | 164 query_field_.text_direction, values, |
165 values, | 165 labels, icons, ids, GetWeakPtr()); |
Garrett Casto
2014/11/23 07:49:48
I would revert this now just to cut down on the di
jww
2014/11/25 02:46:26
Done.
| |
166 labels, | |
167 icons, | |
168 ids, | |
169 GetWeakPtr()); | |
170 } | 166 } |
171 } | 167 } |
172 | 168 |
173 void AutofillExternalDelegate::SetCurrentDataListValues( | 169 void AutofillExternalDelegate::SetCurrentDataListValues( |
174 const std::vector<base::string16>& data_list_values, | 170 const std::vector<base::string16>& data_list_values, |
175 const std::vector<base::string16>& data_list_labels) { | 171 const std::vector<base::string16>& data_list_labels) { |
176 data_list_values_ = data_list_values; | 172 data_list_values_ = data_list_values; |
177 data_list_labels_ = data_list_labels; | 173 data_list_labels_ = data_list_labels; |
178 | 174 |
179 manager_->client()->UpdateAutofillPopupDataListValues(data_list_values, | 175 manager_->client()->UpdateAutofillPopupDataListValues(data_list_values, |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
413 POPUP_ITEM_ID_DATALIST_ENTRY); | 409 POPUP_ITEM_ID_DATALIST_ENTRY); |
414 } | 410 } |
415 | 411 |
416 #if defined(OS_MACOSX) && !defined(OS_IOS) | 412 #if defined(OS_MACOSX) && !defined(OS_IOS) |
417 void AutofillExternalDelegate::PingRenderer() { | 413 void AutofillExternalDelegate::PingRenderer() { |
418 driver_->PingRenderer(); | 414 driver_->PingRenderer(); |
419 } | 415 } |
420 #endif // defined(OS_MACOSX) && !defined(OS_IOS) | 416 #endif // defined(OS_MACOSX) && !defined(OS_IOS) |
421 | 417 |
422 } // namespace autofill | 418 } // namespace autofill |
OLD | NEW |