| 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/chromeos/login/existing_user_controller.h" | 5 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 993 } | 993 } |
| 994 | 994 |
| 995 ServicesCustomizationDocument* customization = | 995 ServicesCustomizationDocument* customization = |
| 996 ServicesCustomizationDocument::GetInstance(); | 996 ServicesCustomizationDocument::GetInstance(); |
| 997 if (!ServicesCustomizationDocument::WasApplied() && | 997 if (!ServicesCustomizationDocument::WasApplied() && |
| 998 customization->IsReady()) { | 998 customization->IsReady()) { |
| 999 // Since we don't use OEM start URL anymore, just mark as applied. | 999 // Since we don't use OEM start URL anymore, just mark as applied. |
| 1000 customization->ApplyCustomization(); | 1000 customization->ApplyCustomization(); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 for (size_t i = 0; i < start_urls.size(); ++i) { | 1003 |
| 1004 CommandLine::ForCurrentProcess()->AppendArg(start_urls[i]); | 1004 // Don't open default Chrome window for the first login of a new |
| 1005 // user because it will hide the Getting Started App window (which is |
| 1006 // launched automatically in that situation). |
| 1007 if (UserManager::Get()->IsCurrentUserNew()) { |
| 1008 CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 1009 ::switches::kSilentLaunch, ""); |
| 1010 } else { |
| 1011 for (size_t i = 0; i < start_urls.size(); ++i) { |
| 1012 CommandLine::ForCurrentProcess()->AppendArg(start_urls[i]); |
| 1013 } |
| 1005 } | 1014 } |
| 1006 } | 1015 } |
| 1007 | 1016 |
| 1008 void ExistingUserController::OptionallyShowReleaseNotes( | 1017 void ExistingUserController::OptionallyShowReleaseNotes( |
| 1009 Profile* profile) const { | 1018 Profile* profile) const { |
| 1010 // TODO(nkostylev): Fix WizardControllerFlowTest case. | 1019 // TODO(nkostylev): Fix WizardControllerFlowTest case. |
| 1011 if (!profile || KioskModeSettings::Get()->IsKioskModeEnabled()) | 1020 if (!profile || KioskModeSettings::Get()->IsKioskModeEnabled()) |
| 1012 return; | 1021 return; |
| 1013 if (UserManager::Get()->GetCurrentUserFlow()->ShouldSkipPostLoginScreens()) | 1022 if (UserManager::Get()->GetCurrentUserFlow()->ShouldSkipPostLoginScreens()) |
| 1014 return; | 1023 return; |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1085 // changed. | 1094 // changed. |
| 1086 UserManager::Get()->SaveUserOAuthStatus( | 1095 UserManager::Get()->SaveUserOAuthStatus( |
| 1087 username, | 1096 username, |
| 1088 User::OAUTH2_TOKEN_STATUS_INVALID); | 1097 User::OAUTH2_TOKEN_STATUS_INVALID); |
| 1089 | 1098 |
| 1090 login_display_->SetUIEnabled(true); | 1099 login_display_->SetUIEnabled(true); |
| 1091 login_display_->ShowGaiaPasswordChanged(username); | 1100 login_display_->ShowGaiaPasswordChanged(username); |
| 1092 } | 1101 } |
| 1093 | 1102 |
| 1094 } // namespace chromeos | 1103 } // namespace chromeos |
| OLD | NEW |