Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Issue 2671463002: Support new --arc-availability flag. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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. This causes an issue that ARC apps
885 // may not be shown in App launcher. cf) crbug.com/685393, crbug.com/678846.
886 // TODO(hidehiko|poromov|lhchavez): Find a correct approach, then remove
887 // this.
888 command_line->AppendSwitchASCII(chromeos::switches::kArcAvailability,
889 "officially-supported");
884 command_line->AppendSwitch(::switches::kForceAndroidAppMode); 890 command_line->AppendSwitch(::switches::kForceAndroidAppMode);
885 command_line->AppendSwitch(::switches::kSilentLaunch); 891 command_line->AppendSwitch(::switches::kSilentLaunch);
886 892
887 // Disable window animation since kiosk app runs in a single full screen 893 // Disable window animation since kiosk app runs in a single full screen
888 // window and window animation causes start-up janks. 894 // window and window animation causes start-up janks.
889 command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled); 895 command_line->AppendSwitch(wm::switches::kWindowAnimationsDisabled);
890 } 896 }
891 897
892 void ChromeUserManagerImpl::DemoAccountLoggedIn() { 898 void ChromeUserManagerImpl::DemoAccountLoggedIn() {
893 DCHECK_CURRENTLY_ON(BrowserThread::UI); 899 DCHECK_CURRENTLY_ON(BrowserThread::UI);
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 break; 1358 break;
1353 default: 1359 default:
1354 NOTREACHED(); 1360 NOTREACHED();
1355 break; 1361 break;
1356 } 1362 }
1357 1363
1358 return user; 1364 return user;
1359 } 1365 }
1360 1366
1361 } // namespace chromeos 1367 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698