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

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

Issue 711433002: Enable device disabling during normal operation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_4_425574_add_device_disabling_manager
Patch Set: Address one more comment I had missed. Created 6 years, 1 month 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 #include "chrome/browser/chromeos/system/device_disabling_manager.h"
14 13
15 namespace chromeos { 14 namespace chromeos {
16 15
17 DeviceDisabledScreen::DeviceDisabledScreen( 16 DeviceDisabledScreen::DeviceDisabledScreen(
18 BaseScreenDelegate* base_screen_delegate, 17 BaseScreenDelegate* base_screen_delegate,
19 DeviceDisabledScreenActor* actor) 18 DeviceDisabledScreenActor* actor)
20 : BaseScreen(base_screen_delegate), 19 : BaseScreen(base_screen_delegate),
21 showing_(false), 20 actor_(actor),
22 actor_(actor) { 21 device_disabling_manager_(g_browser_process->platform_part()->
22 device_disabling_manager()),
23 showing_(false) {
23 DCHECK(actor_); 24 DCHECK(actor_);
24 if (actor_) 25 if (actor_)
25 actor_->SetDelegate(this); 26 actor_->SetDelegate(this);
27 device_disabling_manager_->AddObserver(this);
26 } 28 }
27 29
28 DeviceDisabledScreen::~DeviceDisabledScreen() { 30 DeviceDisabledScreen::~DeviceDisabledScreen() {
29 if (actor_) 31 if (actor_)
30 actor_->SetDelegate(nullptr); 32 actor_->SetDelegate(nullptr);
33 device_disabling_manager_->RemoveObserver(this);
31 } 34 }
32 35
33 void DeviceDisabledScreen::PrepareToShow() { 36 void DeviceDisabledScreen::PrepareToShow() {
34 } 37 }
35 38
36 void DeviceDisabledScreen::Show() { 39 void DeviceDisabledScreen::Show() {
37 if (!actor_ || showing_) 40 if (!actor_ || showing_)
38 return; 41 return;
39 42
40 showing_ = true; 43 showing_ = true;
41 actor_->Show(g_browser_process->platform_part()->device_disabling_manager()-> 44 actor_->Show(device_disabling_manager_->disabled_message());
42 disabled_message());
43 } 45 }
44 46
45 void DeviceDisabledScreen::Hide() { 47 void DeviceDisabledScreen::Hide() {
46 if (!showing_) 48 if (!showing_)
47 return; 49 return;
48 showing_ = false; 50 showing_ = false;
49 51
50 if (actor_) 52 if (actor_)
51 actor_->Hide(); 53 actor_->Hide();
52 } 54 }
53 55
54 std::string DeviceDisabledScreen::GetName() const { 56 std::string DeviceDisabledScreen::GetName() const {
55 return WizardController::kDeviceDisabledScreenName; 57 return WizardController::kDeviceDisabledScreenName;
56 } 58 }
57 59
58 void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) { 60 void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
59 if (actor_ == actor) 61 if (actor_ == actor)
60 actor_ = nullptr; 62 actor_ = nullptr;
61 } 63 }
62 64
65 void DeviceDisabledScreen::OnDisabledMessageChanged(
66 const std::string& disabled_message) {
67 if (actor_)
68 actor_->UpdateMessage(disabled_message);
69 }
70
63 } // namespace chromeos 71 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698