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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.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/login/wallpaper_manager.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

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/login/wizard_controller.h"	5 #include "chrome/browser/chromeos/login/wizard_controller.h"

6	6

7 #include <signal.h>	7 #include <signal.h>

8 #include <stdlib.h>	8 #include <stdlib.h>

9 #include <sys/types.h>	9 #include <sys/types.h>

10	10

11 #include <string>	11 #include <string>

12 #include <vector>	12 #include <vector>

13	13

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

15 #include "base/chromeos/chromeos_version.h"	15 #include "base/chromeos/chromeos_version.h"

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

17 #include "base/file_util.h"	17 #include "base/file_util.h"

18 #include "base/logging.h"	18 #include "base/logging.h"

19 #include "base/metrics/histogram.h"	19 #include "base/metrics/histogram.h"

20 #include "base/threading/thread_restrictions.h"	20 #include "base/threading/thread_restrictions.h"

21 #include "base/values.h"	21 #include "base/values.h"

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

23 #include "chrome/browser/chromeos/cros/cros_library.h"	23 #include "chrome/browser/chromeos/cros/cros_library.h"

24 #include "chrome/browser/chromeos/cros/cryptohome_library.h"	24 #include "chrome/browser/chromeos/cros/cryptohome_library.h"

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

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

27 #include "chrome/browser/chromeos/customization_document.h"	25 #include "chrome/browser/chromeos/customization_document.h"

28 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"	26 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"

29 #include "chrome/browser/chromeos/login/eula_screen.h"	27 #include "chrome/browser/chromeos/login/eula_screen.h"

30 #include "chrome/browser/chromeos/login/existing_user_controller.h"	28 #include "chrome/browser/chromeos/login/existing_user_controller.h"

31 #include "chrome/browser/chromeos/login/helper.h"	29 #include "chrome/browser/chromeos/login/helper.h"

32 #include "chrome/browser/chromeos/login/html_page_screen.h"	30 #include "chrome/browser/chromeos/login/html_page_screen.h"

33 #include "chrome/browser/chromeos/login/login_display_host.h"	31 #include "chrome/browser/chromeos/login/login_display_host.h"

34 #include "chrome/browser/chromeos/login/login_utils.h"	32 #include "chrome/browser/chromeos/login/login_utils.h"

35 #include "chrome/browser/chromeos/login/network_screen.h"	33 #include "chrome/browser/chromeos/login/network_screen.h"

36 #include "chrome/browser/chromeos/login/oobe_display.h"	34 #include "chrome/browser/chromeos/login/oobe_display.h"

37 #include "chrome/browser/chromeos/login/registration_screen.h"	35 #include "chrome/browser/chromeos/login/registration_screen.h"

38 #include "chrome/browser/chromeos/login/update_screen.h"	36 #include "chrome/browser/chromeos/login/update_screen.h"

39 #include "chrome/browser/chromeos/login/user_image_screen.h"	37 #include "chrome/browser/chromeos/login/user_image_screen.h"

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

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

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

41 #include "chrome/browser/prefs/pref_service.h"	41 #include "chrome/browser/prefs/pref_service.h"

42 #include "chrome/browser/profiles/profile_manager.h"	42 #include "chrome/browser/profiles/profile_manager.h"

43 #include "chrome/browser/ui/options/options_util.h"	43 #include "chrome/browser/ui/options/options_util.h"

44 #include "chrome/common/chrome_notification_types.h"	44 #include "chrome/common/chrome_notification_types.h"

45 #include "chrome/common/pref_names.h"	45 #include "chrome/common/pref_names.h"

46 #include "content/public/browser/notification_service.h"	46 #include "content/public/browser/notification_service.h"

47 #include "content/public/browser/notification_types.h"	47 #include "content/public/browser/notification_types.h"

48 #include "ui/base/accelerators/accelerator.h"	48 #include "ui/base/accelerators/accelerator.h"

49 #include "ui/base/l10n/l10n_util.h"	49 #include "ui/base/l10n/l10n_util.h"

50	50

(...skipping 746 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
797 return zero_delay_enabled_;	797 return zero_delay_enabled_;

798 }	798 }

799	799

800 // static	800 // static

801 void WizardController::SetZeroDelays() {	801 void WizardController::SetZeroDelays() {

802 kShowDelayMs = 0;	802 kShowDelayMs = 0;

803 zero_delay_enabled_ = true;	803 zero_delay_enabled_ = true;

804 }	804 }

805	805

806 } // namespace chromeos	806 } // namespace chromeos

OLD	NEW