OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/users/chrome_user_manager_impl.h" | 5 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <cstddef> | 9 #include <cstddef> |
10 #include <set> | 10 #include <set> |
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
876 active_user_ = user; | 876 active_user_ = user; |
877 active_user_->SetStubImage( | 877 active_user_->SetStubImage( |
878 base::MakeUnique<user_manager::UserImage>( | 878 base::MakeUnique<user_manager::UserImage>( |
879 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 879 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
880 IDR_PROFILE_PICTURE_LOADING)), | 880 IDR_PROFILE_PICTURE_LOADING)), |
881 user_manager::User::USER_IMAGE_INVALID, false); | 881 user_manager::User::USER_IMAGE_INVALID, false); |
882 | 882 |
883 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 883 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
884 command_line->AppendSwitch(chromeos::switches::kEnableArc); | 884 command_line->AppendSwitch(chromeos::switches::kEnableArc); |
885 command_line->AppendSwitch(::switches::kForceAndroidAppMode); | 885 command_line->AppendSwitch(::switches::kForceAndroidAppMode); |
| 886 command_line->AppendSwitch(::switches::kSilentLaunch); |
886 | 887 |
887 // Disable window animation since kiosk app runs in a single full screen | 888 // Disable window animation since kiosk app runs in a single full screen |
888 // window and window animation causes start-up janks. | 889 // window and window animation causes start-up janks. |
889 command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled); | 890 command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled); |
890 } | 891 } |
891 | 892 |
892 void ChromeUserManagerImpl::DemoAccountLoggedIn() { | 893 void ChromeUserManagerImpl::DemoAccountLoggedIn() { |
893 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 894 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
894 active_user_ = | 895 active_user_ = |
895 user_manager::User::CreateKioskAppUser(user_manager::DemoAccountId()); | 896 user_manager::User::CreateKioskAppUser(user_manager::DemoAccountId()); |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1357 break; | 1358 break; |
1358 default: | 1359 default: |
1359 NOTREACHED(); | 1360 NOTREACHED(); |
1360 break; | 1361 break; |
1361 } | 1362 } |
1362 | 1363 |
1363 return user; | 1364 return user; |
1364 } | 1365 } |
1365 | 1366 |
1366 } // namespace chromeos | 1367 } // namespace chromeos |
OLD | NEW |