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

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

Issue 863263006: Migrating UpdateScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactor Created 5 years, 11 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/mock_update_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/mock_update_screen.cc b/chrome/browser/chromeos/login/screens/mock_update_screen.cc
index cf914ce2eb11ebd6101eaad2534f54422491037a..02da115ddc08645031cd73fafb367f9b7c095bdf 100644
--- a/chrome/browser/chromeos/login/screens/mock_update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/mock_update_screen.cc
@@ -4,32 +4,36 @@
#include "chrome/browser/chromeos/login/screens/mock_update_screen.h"
-namespace chromeos {
-
using ::testing::AtLeast;
-using ::testing::NotNull;
+using ::testing::_;
+
+namespace chromeos {
MockUpdateScreen::MockUpdateScreen(BaseScreenDelegate* base_screen_delegate,
- UpdateScreenActor* actor)
- : UpdateScreen(base_screen_delegate, actor, NULL) {
+ UpdateView* view)
+ : UpdateScreen(base_screen_delegate, view, NULL) {
}
MockUpdateScreen::~MockUpdateScreen() {
}
-MockUpdateScreenActor::MockUpdateScreenActor()
- : screen_(NULL) {
- EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
+MockUpdateView::MockUpdateView() : model_(nullptr) {
+ EXPECT_CALL(*this, MockBind(_)).Times(AtLeast(1));
+}
+
+MockUpdateView::~MockUpdateView() {
+ if (model_)
+ model_->OnViewDestroyed(this);
}
-MockUpdateScreenActor::~MockUpdateScreenActor() {
- if (screen_)
- screen_->OnActorDestroyed(this);
+void MockUpdateView::Bind(UpdateModel& model) {
+ model_ = &model;
+ MockBind(model);
}
-void MockUpdateScreenActor::SetDelegate(UpdateScreenActor::Delegate* screen) {
- screen_ = screen;
- MockSetDelegate(screen);
+void MockUpdateView::Unbind() {
+ model_ = nullptr;
+ MockUnbind();
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/screens/mock_update_screen.h ('k') | chrome/browser/chromeos/login/screens/network_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698