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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 base::Bind(&InlineLoginHandlerImpl::CloseTab, handler_, | 321 base::Bind(&InlineLoginHandlerImpl::CloseTab, handler_, |
322 signin::ShouldShowAccountManagement(current_url_))); | 322 signin::ShouldShowAccountManagement(current_url_))); |
323 } | 323 } |
324 | 324 |
325 if (reason == signin_metrics::Reason::REASON_REAUTHENTICATION || | 325 if (reason == signin_metrics::Reason::REASON_REAUTHENTICATION || |
326 reason == signin_metrics::Reason::REASON_UNLOCK) { | 326 reason == signin_metrics::Reason::REASON_UNLOCK) { |
327 signin_manager->MergeSigninCredentialIntoCookieJar(); | 327 signin_manager->MergeSigninCredentialIntoCookieJar(); |
328 } | 328 } |
329 LogSigninReason(reason); | 329 LogSigninReason(reason); |
330 } else { | 330 } else { |
331 ProfileSyncService* sync_service = | 331 browser_sync::ProfileSyncService* sync_service = |
332 ProfileSyncServiceFactory::GetForProfile(profile_); | 332 ProfileSyncServiceFactory::GetForProfile(profile_); |
333 SigninErrorController* error_controller = | 333 SigninErrorController* error_controller = |
334 SigninErrorControllerFactory::GetForProfile(profile_); | 334 SigninErrorControllerFactory::GetForProfile(profile_); |
335 | 335 |
336 OneClickSigninSyncStarter::StartSyncMode start_mode = | 336 OneClickSigninSyncStarter::StartSyncMode start_mode = |
337 OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST; | 337 OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST; |
338 if (access_point == signin_metrics::AccessPoint::ACCESS_POINT_SETTINGS || | 338 if (access_point == signin_metrics::AccessPoint::ACCESS_POINT_SETTINGS || |
339 choose_what_to_sync_) { | 339 choose_what_to_sync_) { |
340 bool show_settings_without_configure = | 340 bool show_settings_without_configure = |
341 error_controller->HasError() && sync_service && | 341 error_controller->HasError() && sync_service && |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
929 } | 929 } |
930 | 930 |
931 if (show_account_management) { | 931 if (show_account_management) { |
932 browser->window()->ShowAvatarBubbleFromAvatarButton( | 932 browser->window()->ShowAvatarBubbleFromAvatarButton( |
933 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, | 933 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, |
934 signin::ManageAccountsParams(), | 934 signin::ManageAccountsParams(), |
935 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); | 935 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); |
936 } | 936 } |
937 } | 937 } |
938 } | 938 } |
OLD | NEW |