| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/sync/one_click_signin_sync_starter.h" | 5 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/signin/signin_manager.h" | 9 #include "chrome/browser/signin/signin_manager.h" |
| 10 #include "chrome/browser/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 if (use_default_settings_) { | 60 if (use_default_settings_) { |
| 61 // Just kick off the sync machine, no need to configure it first. | 61 // Just kick off the sync machine, no need to configure it first. |
| 62 profile_sync_service->SetSyncSetupCompleted(); | 62 profile_sync_service->SetSyncSetupCompleted(); |
| 63 profile_sync_service->set_setup_in_progress(false); | 63 profile_sync_service->set_setup_in_progress(false); |
| 64 profile_sync_service->UnsuppressAndStart(); | 64 profile_sync_service->UnsuppressAndStart(); |
| 65 } else { | 65 } else { |
| 66 // Give the user a chance to configure things. We don't clear the | 66 // Give the user a chance to configure things. We don't clear the |
| 67 // ProfileSyncService::setup_in_progress flag because we don't want sync | 67 // ProfileSyncService::setup_in_progress flag because we don't want sync |
| 68 // to start up until after the configure UI is displayed (the configure UI | 68 // to start up until after the configure UI is displayed (the configure UI |
| 69 // will clear the flag when the user is done setting up sync). | 69 // will clear the flag when the user is done setting up sync). |
| 70 LoginUIServiceFactory::GetForProfile(profile_)->ShowLoginUI(false); | 70 LoginUIServiceFactory::GetForProfile(profile_)->ShowLoginUI(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 delete this; | 73 delete this; |
| 74 } | 74 } |
| OLD | NEW |