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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 10918027: Revert 154457 - Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
OLDNEW
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
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/chromeos/login/update_screen.h" 36 #include "chrome/browser/chromeos/login/update_screen.h"
37 #include "chrome/browser/chromeos/login/user_image_screen.h" 37 #include "chrome/browser/chromeos/login/user_image_screen.h"
38 #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" 39 #include "chrome/browser/chromeos/settings/cros_settings.h"
40 #include "chrome/browser/chromeos/settings/cros_settings_names.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/browser_thread.h"
47 #include "content/public/browser/notification_service.h" 46 #include "content/public/browser/notification_service.h"
48 #include "content/public/browser/notification_types.h" 47 #include "content/public/browser/notification_types.h"
49 #include "ui/base/accelerators/accelerator.h" 48 #include "ui/base/accelerators/accelerator.h"
50 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
51 50
52 #if defined(USE_LINUX_BREAKPAD) 51 #if defined(USE_LINUX_BREAKPAD)
53 #include "chrome/app/breakpad_linux.h" 52 #include "chrome/app/breakpad_linux.h"
54 #endif 53 #endif
55 54
56 using content::BrowserThread; 55 using content::BrowserThread;
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 return zero_delay_enabled_; 797 return zero_delay_enabled_;
799 } 798 }
800 799
801 // static 800 // static
802 void WizardController::SetZeroDelays() { 801 void WizardController::SetZeroDelays() {
803 kShowDelayMs = 0; 802 kShowDelayMs = 0;
804 zero_delay_enabled_ = true; 803 zero_delay_enabled_ = true;
805 } 804 }
806 805
807 } // namespace chromeos 806 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/settings/cros_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698