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

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

Issue 14642018: Revert 197960 "[chromeos] Remove dependencies of StatisticsProvi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/chromeos/net/network_portal_detector.h" 46 #include "chrome/browser/chromeos/net/network_portal_detector.h"
47 #include "chrome/browser/chromeos/settings/cros_settings.h" 47 #include "chrome/browser/chromeos/settings/cros_settings.h"
48 #include "chrome/browser/chromeos/settings/cros_settings_names.h" 48 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
49 #include "chrome/browser/chromeos/system/statistics_provider.h" 49 #include "chrome/browser/chromeos/system/statistics_provider.h"
50 #include "chrome/browser/profiles/profile.h" 50 #include "chrome/browser/profiles/profile.h"
51 #include "chrome/browser/profiles/profile_manager.h" 51 #include "chrome/browser/profiles/profile_manager.h"
52 #include "chrome/browser/ui/options/options_util.h" 52 #include "chrome/browser/ui/options/options_util.h"
53 #include "chrome/common/chrome_constants.h" 53 #include "chrome/common/chrome_constants.h"
54 #include "chrome/common/chrome_notification_types.h" 54 #include "chrome/common/chrome_notification_types.h"
55 #include "chrome/common/pref_names.h" 55 #include "chrome/common/pref_names.h"
56 #include "chromeos/chromeos_constants.h"
57 #include "chromeos/dbus/dbus_thread_manager.h" 56 #include "chromeos/dbus/dbus_thread_manager.h"
58 #include "chromeos/dbus/session_manager_client.h" 57 #include "chromeos/dbus/session_manager_client.h"
59 #include "content/public/browser/browser_thread.h" 58 #include "content/public/browser/browser_thread.h"
60 #include "content/public/browser/notification_service.h" 59 #include "content/public/browser/notification_service.h"
61 #include "content/public/browser/notification_source.h" 60 #include "content/public/browser/notification_source.h"
62 #include "content/public/browser/notification_types.h" 61 #include "content/public/browser/notification_types.h"
63 #include "ui/base/accelerators/accelerator.h" 62 #include "ui/base/accelerators/accelerator.h"
64 #include "ui/base/l10n/l10n_util.h" 63 #include "ui/base/l10n/l10n_util.h"
65 64
66 #if defined(USE_LINUX_BREAKPAD) 65 #if defined(USE_LINUX_BREAKPAD)
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 skip_update_enroll_after_eula_(false), 160 skip_update_enroll_after_eula_(false),
162 login_screen_started_(false), 161 login_screen_started_(false),
163 user_image_screen_return_to_previous_hack_(false), 162 user_image_screen_return_to_previous_hack_(false),
164 force_enrollment_(false), 163 force_enrollment_(false),
165 can_exit_enrollment_(true) { 164 can_exit_enrollment_(true) {
166 DCHECK(default_controller_ == NULL); 165 DCHECK(default_controller_ == NULL);
167 default_controller_ = this; 166 default_controller_ = this;
168 167
169 chromeos::system::StatisticsProvider* provider = 168 chromeos::system::StatisticsProvider* provider =
170 chromeos::system::StatisticsProvider::GetInstance(); 169 chromeos::system::StatisticsProvider::GetInstance();
171 provider->GetMachineFlag(chromeos::kOemIsEnterpriseManagedKey, 170 provider->GetMachineFlag(chrome::kOemIsEnterpriseManagedKey,
172 &force_enrollment_); 171 &force_enrollment_);
173 provider->GetMachineFlag(chromeos::kOemCanExitEnterpriseEnrollmentKey, 172 provider->GetMachineFlag(chrome::kOemCanExitEnterpriseEnrollmentKey,
174 &can_exit_enrollment_); 173 &can_exit_enrollment_);
175 } 174 }
176 175
177 WizardController::~WizardController() { 176 WizardController::~WizardController() {
178 if (default_controller_ == this) { 177 if (default_controller_ == this) {
179 default_controller_ = NULL; 178 default_controller_ = NULL;
180 } else { 179 } else {
181 NOTREACHED() << "More than one controller are alive."; 180 NOTREACHED() << "More than one controller are alive.";
182 } 181 }
183 } 182 }
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 return zero_delay_enabled_; 789 return zero_delay_enabled_;
791 } 790 }
792 791
793 // static 792 // static
794 void WizardController::SetZeroDelays() { 793 void WizardController::SetZeroDelays() {
795 kShowDelayMs = 0; 794 kShowDelayMs = 0;
796 zero_delay_enabled_ = true; 795 zero_delay_enabled_ = true;
797 } 796 }
798 797
799 } // namespace chromeos 798 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698