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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
11 #include <string> 11 #include <string>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/callback_helpers.h" 16 #include "base/callback_helpers.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/metrics/histogram.h" 20 #include "base/metrics/histogram.h"
21 #include "base/prefs/pref_registry_simple.h"
22 #include "base/prefs/pref_service.h"
23 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
24 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/browser_process_platform_part.h" 23 #include "chrome/browser/browser_process_platform_part.h"
26 #include "chrome/browser/chrome_notification_types.h" 24 #include "chrome/browser/chrome_notification_types.h"
27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 25 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
28 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 26 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
29 #include "chrome/browser/chromeos/customization/customization_document.h" 27 #include "chrome/browser/chromeos/customization/customization_document.h"
30 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h" 28 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h"
31 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 29 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
32 #include "chrome/browser/chromeos/login/existing_user_controller.h" 30 #include "chrome/browser/chromeos/login/existing_user_controller.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "chromeos/network/network_state_handler.h" 73 #include "chromeos/network/network_state_handler.h"
76 #include "chromeos/network/portal_detector/network_portal_detector.h" 74 #include "chromeos/network/portal_detector/network_portal_detector.h"
77 #include "chromeos/settings/cros_settings_names.h" 75 #include "chromeos/settings/cros_settings_names.h"
78 #include "chromeos/settings/cros_settings_provider.h" 76 #include "chromeos/settings/cros_settings_provider.h"
79 #include "chromeos/settings/timezone_settings.h" 77 #include "chromeos/settings/timezone_settings.h"
80 #include "chromeos/timezone/timezone_provider.h" 78 #include "chromeos/timezone/timezone_provider.h"
81 #include "components/crash/content/app/breakpad_linux.h" 79 #include "components/crash/content/app/breakpad_linux.h"
82 #include "components/pairing/bluetooth_controller_pairing_controller.h" 80 #include "components/pairing/bluetooth_controller_pairing_controller.h"
83 #include "components/pairing/bluetooth_host_pairing_controller.h" 81 #include "components/pairing/bluetooth_host_pairing_controller.h"
84 #include "components/pairing/shark_connection_listener.h" 82 #include "components/pairing/shark_connection_listener.h"
83 #include "components/prefs/pref_registry_simple.h"
84 #include "components/prefs/pref_service.h"
85 #include "components/user_manager/user_manager.h" 85 #include "components/user_manager/user_manager.h"
86 #include "content/public/browser/browser_thread.h" 86 #include "content/public/browser/browser_thread.h"
87 #include "content/public/browser/notification_types.h" 87 #include "content/public/browser/notification_types.h"
88 #include "ui/base/accelerators/accelerator.h" 88 #include "ui/base/accelerators/accelerator.h"
89 89
90 using content::BrowserThread; 90 using content::BrowserThread;
91 91
92 namespace { 92 namespace {
93 // Interval in ms which is used for smooth screen showing. 93 // Interval in ms which is used for smooth screen showing.
94 static int kShowDelayMs = 400; 94 static int kShowDelayMs = 400;
(...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1377 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1378 } 1378 }
1379 1379
1380 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1380 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1381 screen->SetParameters(effective_config, shark_controller_.get()); 1381 screen->SetParameters(effective_config, shark_controller_.get());
1382 SetStatusAreaVisible(true); 1382 SetStatusAreaVisible(true);
1383 SetCurrentScreen(screen); 1383 SetCurrentScreen(screen);
1384 } 1384 }
1385 1385
1386 } // namespace chromeos 1386 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698