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

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

Issue 9703098: Remove "base/values.h" import from "base/location.h", fix up downstream files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix one more file on ChromiumOS Created 8 years, 9 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 <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/threading/thread_restrictions.h" 18 #include "base/threading/thread_restrictions.h"
19 #include "base/values.h"
19 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chromeos/cros/cros_library.h" 21 #include "chrome/browser/chromeos/cros/cros_library.h"
21 #include "chrome/browser/chromeos/cros/cryptohome_library.h" 22 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
22 #include "chrome/browser/chromeos/cros_settings.h" 23 #include "chrome/browser/chromeos/cros_settings.h"
23 #include "chrome/browser/chromeos/cros_settings_names.h" 24 #include "chrome/browser/chromeos/cros_settings_names.h"
24 #include "chrome/browser/chromeos/customization_document.h" 25 #include "chrome/browser/chromeos/customization_document.h"
25 #include "chrome/browser/chromeos/language_preferences.h" 26 #include "chrome/browser/chromeos/language_preferences.h"
26 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" 27 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"
27 #include "chrome/browser/chromeos/login/eula_screen.h" 28 #include "chrome/browser/chromeos/login/eula_screen.h"
28 #include "chrome/browser/chromeos/login/existing_user_controller.h" 29 #include "chrome/browser/chromeos/login/existing_user_controller.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 143
143 WizardController::~WizardController() { 144 WizardController::~WizardController() {
144 if (default_controller_ == this) { 145 if (default_controller_ == this) {
145 default_controller_ = NULL; 146 default_controller_ = NULL;
146 } else { 147 } else {
147 NOTREACHED() << "More than one controller are alive."; 148 NOTREACHED() << "More than one controller are alive.";
148 } 149 }
149 } 150 }
150 151
151 void WizardController::Init(const std::string& first_screen_name, 152 void WizardController::Init(const std::string& first_screen_name,
152 DictionaryValue* screen_parameters) { 153 base::DictionaryValue* screen_parameters) {
153 VLOG(1) << "Starting OOBE wizard with screen: " << first_screen_name; 154 VLOG(1) << "Starting OOBE wizard with screen: " << first_screen_name;
154 first_screen_name_ = first_screen_name; 155 first_screen_name_ = first_screen_name;
155 screen_parameters_.reset(screen_parameters); 156 screen_parameters_.reset(screen_parameters);
156 157
157 bool oobe_complete = IsOobeCompleted(); 158 bool oobe_complete = IsOobeCompleted();
158 if (!oobe_complete || first_screen_name == kOutOfBoxScreenName) { 159 if (!oobe_complete || first_screen_name == kOutOfBoxScreenName) {
159 is_out_of_box_ = true; 160 is_out_of_box_ = true;
160 } 161 }
161 162
162 AdvanceToScreen(first_screen_name); 163 AdvanceToScreen(first_screen_name);
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 721
721 bool WizardController::usage_statistics_reporting() const { 722 bool WizardController::usage_statistics_reporting() const {
722 return usage_statistics_reporting_; 723 return usage_statistics_reporting_;
723 } 724 }
724 725
725 void WizardController::SetZeroDelays() { 726 void WizardController::SetZeroDelays() {
726 kShowDelayMs = 0; 727 kShowDelayMs = 0;
727 } 728 }
728 729
729 } // namespace chromeos 730 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/extensions/extension_prefs_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698