Chromium Code Reviews| 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 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 873 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 873 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 874 | 874 |
| 875 active_user_ = user; | 875 active_user_ = user; |
| 876 active_user_->SetStubImage( | 876 active_user_->SetStubImage( |
| 877 base::MakeUnique<user_manager::UserImage>( | 877 base::MakeUnique<user_manager::UserImage>( |
| 878 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 878 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
| 879 IDR_PROFILE_PICTURE_LOADING)), | 879 IDR_PROFILE_PICTURE_LOADING)), |
| 880 user_manager::User::USER_IMAGE_INVALID, false); | 880 user_manager::User::USER_IMAGE_INVALID, false); |
| 881 | 881 |
| 882 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 882 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 883 command_line->AppendSwitch(chromeos::switches::kEnableArc); | 883 // This works partially, because sevices calling IsArcAvailable() |
| 884 // before Kiosk log-in does not work. | |
|
Yusuke Sato
2017/02/03 19:19:02
Any user-visible issues here? Please document if a
Sergey Poromov
2017/02/03 22:58:57
Generally, this line should be removed from here.
hidehiko
2017/02/07 04:50:50
Done.
| |
| 885 // TODO(hidehiko|poromov|lhchavez): Find a correct approach. | |
| 886 command_line->AppendSwitchASCII(chromeos::switches::kArcAvailability, | |
| 887 "official-support"); | |
| 884 command_line->AppendSwitch(::switches::kForceAndroidAppMode); | 888 command_line->AppendSwitch(::switches::kForceAndroidAppMode); |
| 885 command_line->AppendSwitch(::switches::kSilentLaunch); | 889 command_line->AppendSwitch(::switches::kSilentLaunch); |
| 886 | 890 |
| 887 // Disable window animation since kiosk app runs in a single full screen | 891 // Disable window animation since kiosk app runs in a single full screen |
| 888 // window and window animation causes start-up janks. | 892 // window and window animation causes start-up janks. |
| 889 command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled); | 893 command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled); |
| 890 } | 894 } |
| 891 | 895 |
| 892 void ChromeUserManagerImpl::DemoAccountLoggedIn() { | 896 void ChromeUserManagerImpl::DemoAccountLoggedIn() { |
| 893 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 897 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1352 break; | 1356 break; |
| 1353 default: | 1357 default: |
| 1354 NOTREACHED(); | 1358 NOTREACHED(); |
| 1355 break; | 1359 break; |
| 1356 } | 1360 } |
| 1357 | 1361 |
| 1358 return user; | 1362 return user; |
| 1359 } | 1363 } |
| 1360 | 1364 |
| 1361 } // namespace chromeos | 1365 } // namespace chromeos |
| OLD | NEW |