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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Issue 2403053003: Remove unused email from install attributes and add support for AD. (Closed)
Patch Set: Address Maksim's comments. Created 4 years, 2 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 | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/app_mode/kiosk_app_manager.h" 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 apps_.emplace_back(KioskAppData::CreateForTest( 253 apps_.emplace_back(KioskAppData::CreateForTest(
254 this, app_id, account_id, update_url, required_platform_version)); 254 this, app_id, account_id, update_url, required_platform_version));
255 } 255 }
256 256
257 void KioskAppManager::EnableConsumerKioskAutoLaunch( 257 void KioskAppManager::EnableConsumerKioskAutoLaunch(
258 const KioskAppManager::EnableKioskAutoLaunchCallback& callback) { 258 const KioskAppManager::EnableKioskAutoLaunchCallback& callback) {
259 policy::BrowserPolicyConnectorChromeOS* connector = 259 policy::BrowserPolicyConnectorChromeOS* connector =
260 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 260 g_browser_process->platform_part()->browser_policy_connector_chromeos();
261 connector->GetInstallAttributes()->LockDevice( 261 connector->GetInstallAttributes()->LockDevice(
262 std::string(), // user
263 policy::DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH, 262 policy::DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,
263 std::string(), // domain
264 std::string(), // realm
264 std::string(), // device_id 265 std::string(), // device_id
265 base::Bind( 266 base::Bind(
266 &KioskAppManager::OnLockDevice, base::Unretained(this), callback)); 267 &KioskAppManager::OnLockDevice, base::Unretained(this), callback));
267 } 268 }
268 269
269 void KioskAppManager::GetConsumerKioskAutoLaunchStatus( 270 void KioskAppManager::GetConsumerKioskAutoLaunchStatus(
270 const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& callback) { 271 const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& callback) {
271 policy::BrowserPolicyConnectorChromeOS* connector = 272 policy::BrowserPolicyConnectorChromeOS* connector =
272 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 273 g_browser_process->platform_part()->browser_policy_connector_chromeos();
273 connector->GetInstallAttributes()->ReadImmutableAttributes( 274 connector->GetInstallAttributes()->ReadImmutableAttributes(
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 base::TimeDelta KioskAppManager::GetAutoLaunchDelay() const { 881 base::TimeDelta KioskAppManager::GetAutoLaunchDelay() const {
881 int delay; 882 int delay;
882 if (!CrosSettings::Get()->GetInteger( 883 if (!CrosSettings::Get()->GetInteger(
883 kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) { 884 kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) {
884 return base::TimeDelta(); // Default delay is 0ms. 885 return base::TimeDelta(); // Default delay is 0ms.
885 } 886 }
886 return base::TimeDelta::FromMilliseconds(delay); 887 return base::TimeDelta::FromMilliseconds(delay);
887 } 888 }
888 889
889 } // namespace chromeos 890 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698