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

Unified Diff: chrome/browser/chromeos/login/screens/enable_debugging_screen.cc

Issue 2738973003: cros: WIP patch to remove EnableDebuggingScreenView
Patch Set: Initial upload Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/enable_debugging_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc b/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc
index 7329f20744df53306bcb36bf4d4d07e423735ceb..c2c57c0307ec9a0aab56e79040af95af718fc2be 100644
--- a/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc
+++ b/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc
@@ -11,37 +11,31 @@
namespace chromeos {
EnableDebuggingScreen::EnableDebuggingScreen(BaseScreenDelegate* delegate,
- EnableDebuggingScreenView* view)
- : BaseScreen(delegate, OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING),
- view_(view) {
- DCHECK(view_);
- if (view_)
- view_->SetDelegate(this);
-}
+ CoreOobeView* view)
+ : BaseScreen(delegate, kScreenId), view_(view) {}
-EnableDebuggingScreen::~EnableDebuggingScreen() {
- if (view_)
- view_->SetDelegate(NULL);
-}
+EnableDebuggingScreen::~EnableDebuggingScreen() {}
+// TODO(jdufault): Deduplicate this method. See crbug.com/672142.
void EnableDebuggingScreen::Show() {
if (view_)
- view_->Show();
+ view_->Show(kScreenId);
}
+// TODO(jdufault): Deduplicate this method. See crbug.com/672142.
void EnableDebuggingScreen::Hide() {
if (view_)
- view_->Hide();
+ view_->Hide(kScreenId);
}
-void EnableDebuggingScreen::OnExit(bool success) {
+void EnableDebuggingScreen::OnEnableDebuggingScreenViewExit(bool success) {
Finish(success ? ScreenExitCode::ENABLE_DEBUGGING_FINISHED
: ScreenExitCode::ENABLE_DEBUGGING_CANCELED);
}
-void EnableDebuggingScreen::OnViewDestroyed(EnableDebuggingScreenView* view) {
- if (view_ == view)
- view_ = NULL;
+void EnableDebuggingScreen::OnViewDestroyed(CoreOobeView* view) {
+ DCHECK(view_ == view);
+ view_ = nullptr;
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698