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/webui/signin/inline_login_handler_impl.h" | 5 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 | 169 |
170 OneClickSigninSyncStarter::ConfirmationRequired confirmation_required; | 170 OneClickSigninSyncStarter::ConfirmationRequired confirmation_required; |
171 if (confirm_untrusted_signin_) { | 171 if (confirm_untrusted_signin_) { |
172 confirmation_required = | 172 confirmation_required = |
173 OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN; | 173 OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN; |
174 } else if (is_new_avatar_menu) { | 174 } else if (is_new_avatar_menu) { |
175 confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN; | 175 confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN; |
176 } else { | 176 } else { |
177 confirmation_required = | 177 confirmation_required = |
178 source == signin::SOURCE_SETTINGS || | 178 source == signin::SOURCE_SETTINGS || |
179 source == signin::SOURCE_WEBSTORE_INSTALL || | |
180 choose_what_to_sync_ ? | 179 choose_what_to_sync_ ? |
181 OneClickSigninSyncStarter::NO_CONFIRMATION : | 180 OneClickSigninSyncStarter::NO_CONFIRMATION : |
182 OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN; | 181 OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN; |
183 } | 182 } |
184 | 183 |
185 bool start_signin = | 184 bool start_signin = |
186 !OneClickSigninHelper::HandleCrossAccountError( | 185 !OneClickSigninHelper::HandleCrossAccountError( |
187 profile_, "", | 186 profile_, "", |
188 email, password_, refresh_token, | 187 email, password_, refresh_token, |
189 OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT, | 188 OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT, |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 } | 450 } |
452 } | 451 } |
453 | 452 |
454 if (show_account_management) { | 453 if (show_account_management) { |
455 browser->window()->ShowAvatarBubbleFromAvatarButton( | 454 browser->window()->ShowAvatarBubbleFromAvatarButton( |
456 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, | 455 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, |
457 signin::ManageAccountsParams()); | 456 signin::ManageAccountsParams()); |
458 } | 457 } |
459 } | 458 } |
460 } | 459 } |
OLD | NEW |