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

Side by Side Diff: chrome/browser/chromeos/login/screens/device_disabled_screen.cc

Issue 2815893002: Break circular dependency between InitializeDeviceDisablingManager and DeviceDisabledScreen (Closed)
Patch Set: Added a check to the crash site 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/login/screens/device_disabled_screen.h" 5 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/browser_process_platform_part.h" 11 #include "chrome/browser/browser_process_platform_part.h"
12 #include "chrome/browser/chromeos/login/wizard_controller.h" 12 #include "chrome/browser/chromeos/login/wizard_controller.h"
13 13
14 namespace chromeos { 14 namespace chromeos {
15 15
16 DeviceDisabledScreen::DeviceDisabledScreen( 16 DeviceDisabledScreen::DeviceDisabledScreen(
17 BaseScreenDelegate* base_screen_delegate, 17 BaseScreenDelegate* base_screen_delegate,
18 DeviceDisabledScreenView* view) 18 DeviceDisabledScreenView* view)
19 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_DEVICE_DISABLED), 19 : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_DEVICE_DISABLED),
20 view_(view), 20 view_(view),
21 device_disabling_manager_( 21 device_disabling_manager_(
22 g_browser_process->platform_part()->device_disabling_manager()), 22 g_browser_process->platform_part()->device_disabling_manager()),
23 showing_(false) { 23 showing_(false) {
24 DCHECK(view_); 24 DCHECK(view_);
25 if (view_) 25 if (view_)
26 view_->SetDelegate(this); 26 view_->SetDelegate(this);
27 CHECK(device_disabling_manager_);
emaxx 2017/04/12 17:05:49 I think DCHECK is more suitable there. See the Sty
achuithb 2017/04/12 19:45:14 Personally I don't see the value of DCHECKing on t
Ivan Šandrk 2017/04/13 13:37:59 It wasn't really crashing on the next line, it was
achuithb 2017/04/13 18:40:03 It's fine if you want to leave in the DCHECK. In g
27 device_disabling_manager_->AddObserver(this); 28 device_disabling_manager_->AddObserver(this);
28 } 29 }
29 30
30 DeviceDisabledScreen::~DeviceDisabledScreen() { 31 DeviceDisabledScreen::~DeviceDisabledScreen() {
31 if (view_) 32 if (view_)
32 view_->SetDelegate(nullptr); 33 view_->SetDelegate(nullptr);
33 device_disabling_manager_->RemoveObserver(this); 34 device_disabling_manager_->RemoveObserver(this);
34 } 35 }
35 36
36 void DeviceDisabledScreen::Show() { 37 void DeviceDisabledScreen::Show() {
(...skipping 26 matching lines...) Expand all
63 return device_disabling_manager_->disabled_message(); 64 return device_disabling_manager_->disabled_message();
64 } 65 }
65 66
66 void DeviceDisabledScreen::OnDisabledMessageChanged( 67 void DeviceDisabledScreen::OnDisabledMessageChanged(
67 const std::string& disabled_message) { 68 const std::string& disabled_message) {
68 if (view_) 69 if (view_)
69 view_->UpdateMessage(disabled_message); 70 view_->UpdateMessage(disabled_message);
70 } 71 }
71 72
72 } // namespace chromeos 73 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698