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

Side by Side Diff: chrome/browser/chromeos/system/device_disabling_manager.cc

Issue 2830853002: Break circular dependency between InitializeDeviceDisablingManager and DeviceDisabledScreen
Patch Set: Created 3 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/system/device_disabling_manager.h" 5 #include "chrome/browser/chromeos/system/device_disabling_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 25 matching lines...) Expand all
36 CrosSettings* cros_settings, 36 CrosSettings* cros_settings,
37 user_manager::UserManager* user_manager) 37 user_manager::UserManager* user_manager)
38 : delegate_(delegate), 38 : delegate_(delegate),
39 browser_policy_connector_(g_browser_process->platform_part()-> 39 browser_policy_connector_(g_browser_process->platform_part()->
40 browser_policy_connector_chromeos()), 40 browser_policy_connector_chromeos()),
41 cros_settings_(cros_settings), 41 cros_settings_(cros_settings),
42 user_manager_(user_manager), 42 user_manager_(user_manager),
43 device_disabled_(false), 43 device_disabled_(false),
44 weak_factory_(this) { 44 weak_factory_(this) {
45 CHECK(delegate_); 45 CHECK(delegate_);
46 Init();
47 } 46 }
48 47
49 DeviceDisablingManager::~DeviceDisablingManager() { 48 DeviceDisablingManager::~DeviceDisablingManager() {
50 } 49 }
51 50
52 void DeviceDisablingManager::AddObserver(Observer* observer) { 51 void DeviceDisablingManager::AddObserver(Observer* observer) {
53 observers_.AddObserver(observer); 52 observers_.AddObserver(observer);
54 } 53 }
55 54
56 void DeviceDisablingManager::RemoveObserver(Observer* observer) { 55 void DeviceDisablingManager::RemoveObserver(Observer* observer) {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 218
220 // Cache the enrollment domain. 219 // Cache the enrollment domain.
221 enrollment_domain_ = browser_policy_connector_->GetEnterpriseDomain(); 220 enrollment_domain_ = browser_policy_connector_->GetEnterpriseDomain();
222 221
223 // If no session or login is in progress, show the device disabled screen. 222 // If no session or login is in progress, show the device disabled screen.
224 delegate_->ShowDeviceDisabledScreen(); 223 delegate_->ShowDeviceDisabledScreen();
225 } 224 }
226 225
227 } // namespace system 226 } // namespace system
228 } // namespace chromeos 227 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698