summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff options
context:
space:
mode:
authorbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 15:37:26 +0000
committerbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 15:37:26 +0000
commit08450ddae76a3aa8fdd03dad55eeb60eb9e47039 (patch)
tree3e332be53f87225d671cdc8cbd59c8f76ec718bf /chrome/browser/chromeos/chrome_browser_main_chromeos.cc
parent2288626251248d496510c8c2a7c1b251e40edc7c (diff)
downloadchromium_src-08450ddae76a3aa8fdd03dad55eeb60eb9e47039.zip
chromium_src-08450ddae76a3aa8fdd03dad55eeb60eb9e47039.tar.gz
chromium_src-08450ddae76a3aa8fdd03dad55eeb60eb9e47039.tar.bz2
Translate device-local account IDs to user IDs
This CL decouples the namespaces used for device-local accounts in policy and user management. In addition to the account ID assigned by the server, each device-local account is given a user ID that always follows a canonical format and allows the account type to be identified just by looking at the user ID, regardless of the format chosen for the account ID by the server. BUG=240276 TEST=Manual in VM TBR=jhawkins (chrome/browser/ui/webui/policy_ui.cc) Review URL: https://chromiumcodereview.appspot.com/14927015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/chrome_browser_main_chromeos.cc')
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 4f88eae..816a71f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -270,8 +270,8 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
void RunAutoLaunchKioskApp() {
// KioskAppLauncher deletes itself when done.
- (new KioskAppLauncher(
- KioskAppManager::Get()->GetAutoLaunchApp()))->Start();
+ (new KioskAppLauncher(KioskAppManager::Get(),
+ KioskAppManager::Get()->GetAutoLaunchApp()))->Start();
// Login screen is skipped but 'login-prompt-visible' signal is still needed.
LOG(INFO) << "Kiosk app auto launch >> login-prompt-visible";