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

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

Unified 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, 5 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 side-by-side diff with in-line comments

Download patch

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

index cfb337343127f7d9e65c4237b60211446eeb94ed..f15cb44adc92f257ff18d793108296809fc5ea83 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.cc

@@ -10,13 +10,13 @@

#include "base/command_line.h"

#include "base/lazy_instance.h"

#include "chrome/browser/browser_process.h"

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

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

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

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

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

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

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

-#include "chrome/browser/policy/cloud_policy_constants.h"

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

+#include "chrome/browser/policy/cloud_policy_constants.h"

#include "chrome/common/chrome_switches.h"

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