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

Side by Side Diff: chrome/browser/browser_process_platform_part_chromeos.cc

Issue 2815893002: Break circular dependency between InitializeDeviceDisablingManager and DeviceDisabledScreen (Closed)
Patch Set: Removed unnecessary DCHECKs 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/device_disabled_screen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/browser_process_platform_part_chromeos.h" 5 #include "chrome/browser/browser_process_platform_part_chromeos.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/time/default_tick_clock.h" 9 #include "base/time/default_tick_clock.h"
10 #include "base/time/tick_clock.h" 10 #include "base/time/tick_clock.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 void BrowserProcessPlatformPart::InitializeDeviceDisablingManager() { 60 void BrowserProcessPlatformPart::InitializeDeviceDisablingManager() {
61 DCHECK(!device_disabling_manager_); 61 DCHECK(!device_disabling_manager_);
62 62
63 device_disabling_manager_delegate_.reset( 63 device_disabling_manager_delegate_.reset(
64 new chromeos::system::DeviceDisablingManagerDefaultDelegate); 64 new chromeos::system::DeviceDisablingManagerDefaultDelegate);
65 device_disabling_manager_.reset(new chromeos::system::DeviceDisablingManager( 65 device_disabling_manager_.reset(new chromeos::system::DeviceDisablingManager(
66 device_disabling_manager_delegate_.get(), 66 device_disabling_manager_delegate_.get(),
67 chromeos::CrosSettings::Get(), 67 chromeos::CrosSettings::Get(),
68 user_manager::UserManager::Get())); 68 user_manager::UserManager::Get()));
69 device_disabling_manager_->Init();
69 } 70 }
70 71
71 void BrowserProcessPlatformPart::ShutdownDeviceDisablingManager() { 72 void BrowserProcessPlatformPart::ShutdownDeviceDisablingManager() {
72 device_disabling_manager_.reset(); 73 device_disabling_manager_.reset();
73 device_disabling_manager_delegate_.reset(); 74 device_disabling_manager_delegate_.reset();
74 } 75 }
75 76
76 void BrowserProcessPlatformPart::InitializeSessionManager() { 77 void BrowserProcessPlatformPart::InitializeSessionManager() {
77 DCHECK(!session_manager_); 78 DCHECK(!session_manager_);
78 session_manager_ = base::MakeUnique<chromeos::ChromeSessionManager>(); 79 session_manager_ = base::MakeUnique<chromeos::ChromeSessionManager>();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 152
152 void BrowserProcessPlatformPart::DestroySystemClock() { 153 void BrowserProcessPlatformPart::DestroySystemClock() {
153 system_clock_.reset(); 154 system_clock_.reset();
154 } 155 }
155 156
156 void BrowserProcessPlatformPart::CreateProfileHelper() { 157 void BrowserProcessPlatformPart::CreateProfileHelper() {
157 DCHECK(!created_profile_helper_ && !profile_helper_); 158 DCHECK(!created_profile_helper_ && !profile_helper_);
158 created_profile_helper_ = true; 159 created_profile_helper_ = true;
159 profile_helper_.reset(new chromeos::ProfileHelper()); 160 profile_helper_.reset(new chromeos::ProfileHelper());
160 } 161 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/device_disabled_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698