chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/device_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/kiosk_mode/kiosk_mode_settings.h"	5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/lazy_instance.h"	11 #include "base/lazy_instance.h"

12 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/chromeos/cros_settings.h"

14 #include "chrome/browser/chromeos/cros_settings_names.h"

15 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"	13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"

16 #include "chrome/browser/chromeos/login/user_manager.h"	14 #include "chrome/browser/chromeos/login/user_manager.h"

	15 #include "chrome/browser/chromeos/settings/cros_settings.h"

	16 #include "chrome/browser/chromeos/settings/cros_settings_names.h"

17 #include "chrome/browser/lifetime/application_lifetime.h"	17 #include "chrome/browser/lifetime/application_lifetime.h"

	18 #include "chrome/browser/policy/browser_policy_connector.h"

18 #include "chrome/browser/policy/cloud_policy_constants.h"	19 #include "chrome/browser/policy/cloud_policy_constants.h"

19 #include "chrome/browser/policy/browser_policy_connector.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

21 #include "content/public/browser/browser_thread.h"	21 #include "content/public/browser/browser_thread.h"

22	22

23 namespace chromeos {	23 namespace chromeos {

24	24

25 namespace {	25 namespace {

26 const int kDeviceModeFetchRetryDelayMs = 500;	26 const int kDeviceModeFetchRetryDelayMs = 500;

27 }	27 }

28	28

29 const int KioskModeSettings::kMaxIdleLogoutTimeout = 600000; // ms	29 const int KioskModeSettings::kMaxIdleLogoutTimeout = 600000; // ms

(...skipping 166 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
196 browser::ExitCleanly();	196 browser::ExitCleanly();

197 break;	197 break;

198 default:	198 default:

199 break;	199 break;

200 }	200 }

201 }	201 }

202 }	202 }

203	203

204	204

205 } // namespace chromeos	205 } // namespace chromeos

OLD	NEW