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

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

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, fix to Screen.initialize(). 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/mock_eula_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/mock_eula_screen.cc b/chrome/browser/chromeos/login/screens/mock_eula_screen.cc
index 694ba243401e025e598d09f58be6f9f427e15606..41f7508e9d244ceb9aaf49df5b28b5abd5c309bf 100644
--- a/chrome/browser/chromeos/login/screens/mock_eula_screen.cc
+++ b/chrome/browser/chromeos/login/screens/mock_eula_screen.cc
@@ -7,29 +7,34 @@
namespace chromeos {
using ::testing::AtLeast;
-using ::testing::NotNull;
+using ::testing::_;
MockEulaScreen::MockEulaScreen(BaseScreenDelegate* base_screen_delegate,
Delegate* delegate,
- EulaScreenActor* actor)
- : EulaScreen(base_screen_delegate, delegate, actor) {
+ EulaView* view)
+ : EulaScreen(base_screen_delegate, delegate, view) {
}
MockEulaScreen::~MockEulaScreen() {
}
-MockEulaScreenActor::MockEulaScreenActor() {
- EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
+MockEulaView::MockEulaView() {
+ EXPECT_CALL(*this, MockBind(_)).Times(AtLeast(1));
}
-MockEulaScreenActor::~MockEulaScreenActor() {
- if (delegate_)
- delegate_->OnActorDestroyed(this);
+MockEulaView::~MockEulaView() {
+ if (model_)
+ model_->OnViewDestroyed(this);
}
-void MockEulaScreenActor::SetDelegate(Delegate* delegate) {
- delegate_ = delegate;
- MockSetDelegate(delegate);
+void MockEulaView::Bind(EulaModel& model) {
+ model_ = &model;
+ MockBind(model);
+}
+
+void MockEulaView::Unbind() {
+ model_ = nullptr;
+ MockUnbind();
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/screens/mock_eula_screen.h ('k') | chrome/browser/chromeos/login/ui/oobe_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698