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

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

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. 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/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/browser_process_platform_part.h" 15 #include "chrome/browser/browser_process_platform_part.h"
16 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 16 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
17 #include "chrome/browser/chromeos/login/wizard_controller.h" 17 #include "chrome/browser/chromeos/login/wizard_controller.h"
18 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 18 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
19 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 19 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
20 #include "chrome/browser/chromeos/policy/server_backed_device_state.h" 20 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
21 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
22 #include "chromeos/chromeos_switches.h" 22 #include "chromeos/chromeos_switches.h"
23 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 23 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
24 24
25 namespace chromeos { 25 namespace chromeos {
26 26
27 DeviceDisabledScreen::DeviceDisabledScreen(ScreenObserver* observer, 27 DeviceDisabledScreen::DeviceDisabledScreen(
28 DeviceDisabledScreenActor* actor) 28 BaseScreenDelegate* base_screen_delegate,
29 : BaseScreen(observer), 29 DeviceDisabledScreenActor* actor)
30 : BaseScreen(base_screen_delegate),
30 showing_(false), 31 showing_(false),
31 actor_(actor), 32 actor_(actor),
32 weak_factory_(this) { 33 weak_factory_(this) {
33 DCHECK(actor_); 34 DCHECK(actor_);
34 if (actor_) 35 if (actor_)
35 actor_->SetDelegate(this); 36 actor_->SetDelegate(this);
36 } 37 }
37 38
38 DeviceDisabledScreen::~DeviceDisabledScreen() { 39 DeviceDisabledScreen::~DeviceDisabledScreen() {
39 if (actor_) 40 if (actor_)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 std::string DeviceDisabledScreen::GetName() const { 100 std::string DeviceDisabledScreen::GetName() const {
100 return WizardController::kDeviceDisabledScreenName; 101 return WizardController::kDeviceDisabledScreenName;
101 } 102 }
102 103
103 void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) { 104 void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
104 if (actor_ == actor) 105 if (actor_ == actor)
105 actor_ = nullptr; 106 actor_ = nullptr;
106 } 107 }
107 108
108 void DeviceDisabledScreen::IndicateDeviceNotDisabled() { 109 void DeviceDisabledScreen::IndicateDeviceNotDisabled() {
109 get_screen_observer()->OnExit(ScreenObserver::DEVICE_NOT_DISABLED); 110 get_base_screen_delegate()->OnExit(BaseScreenDelegate::DEVICE_NOT_DISABLED);
110 } 111 }
111 112
112 } // namespace chromeos 113 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698