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/browser/ui/autofill/autofill_dialog_controller_impl.h" | 5 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 2159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2170 } | 2170 } |
2171 | 2171 |
2172 popup_controller_ = AutofillPopupControllerImpl::GetOrCreate( | 2172 popup_controller_ = AutofillPopupControllerImpl::GetOrCreate( |
2173 popup_controller_, | 2173 popup_controller_, |
2174 weak_ptr_factory_.GetWeakPtr(), | 2174 weak_ptr_factory_.GetWeakPtr(), |
2175 NULL, | 2175 NULL, |
2176 parent_view, | 2176 parent_view, |
2177 content_bounds, | 2177 content_bounds, |
2178 base::i18n::IsRTL() ? | 2178 base::i18n::IsRTL() ? |
2179 base::i18n::RIGHT_TO_LEFT : base::i18n::LEFT_TO_RIGHT); | 2179 base::i18n::RIGHT_TO_LEFT : base::i18n::LEFT_TO_RIGHT); |
2180 popup_controller_->Show(popup_values, | 2180 popup_controller_->Show(popup_values, popup_labels, popup_icons, popup_ids); |
Garrett Casto
2014/11/23 07:49:48
Seems like you should just revert this change now.
jww
2014/11/25 02:46:26
Done.
| |
2181 popup_labels, | |
2182 popup_icons, | |
2183 popup_ids); | |
2184 } | 2181 } |
2185 | 2182 |
2186 void AutofillDialogControllerImpl::FocusMoved() { | 2183 void AutofillDialogControllerImpl::FocusMoved() { |
2187 HidePopup(); | 2184 HidePopup(); |
2188 } | 2185 } |
2189 | 2186 |
2190 bool AutofillDialogControllerImpl::ShouldShowErrorBubble() const { | 2187 bool AutofillDialogControllerImpl::ShouldShowErrorBubble() const { |
2191 return popup_input_type_ == UNKNOWN_TYPE; | 2188 return popup_input_type_ == UNKNOWN_TYPE; |
2192 } | 2189 } |
2193 | 2190 |
(...skipping 1961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4155 view_->UpdateButtonStrip(); | 4152 view_->UpdateButtonStrip(); |
4156 } | 4153 } |
4157 | 4154 |
4158 void AutofillDialogControllerImpl::FetchWalletCookie() { | 4155 void AutofillDialogControllerImpl::FetchWalletCookie() { |
4159 net::URLRequestContextGetter* request_context = profile_->GetRequestContext(); | 4156 net::URLRequestContextGetter* request_context = profile_->GetRequestContext(); |
4160 signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context)); | 4157 signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context)); |
4161 signin_helper_->StartWalletCookieValueFetch(); | 4158 signin_helper_->StartWalletCookieValueFetch(); |
4162 } | 4159 } |
4163 | 4160 |
4164 } // namespace autofill | 4161 } // namespace autofill |
OLD | NEW |