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

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

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.h
diff --git a/chrome/browser/chromeos/login/screens/mock_eula_screen.h b/chrome/browser/chromeos/login/screens/mock_eula_screen.h
index 8594e9a9cbef3ca0378a0a4bcfb904860b534e33..aa6eb233383fbd05f979e529b305e9a951999625 100644
--- a/chrome/browser/chromeos/login/screens/mock_eula_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_eula_screen.h
@@ -7,7 +7,7 @@
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/screens/eula_screen.h"
-#include "chrome/browser/chromeos/login/screens/eula_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/eula_view.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
@@ -16,16 +16,17 @@ class MockEulaScreen : public EulaScreen {
public:
MockEulaScreen(BaseScreenDelegate* base_screen_delegate,
Delegate* delegate,
- EulaScreenActor* actor);
+ EulaView* view);
virtual ~MockEulaScreen();
};
-class MockEulaScreenActor : public EulaScreenActor {
+class MockEulaView : public EulaView {
public:
- MockEulaScreenActor();
- virtual ~MockEulaScreenActor();
+ MockEulaView();
+ virtual ~MockEulaView();
- virtual void SetDelegate(Delegate* delegate);
+ virtual void Bind(EulaModel& model) override;
+ virtual void Unbind() override;
MOCK_METHOD0(PrepareToShow, void());
MOCK_METHOD0(Show, void());
@@ -33,11 +34,12 @@ class MockEulaScreenActor : public EulaScreenActor {
MOCK_CONST_METHOD0(GetName, std::string());
- MOCK_METHOD1(MockSetDelegate, void(Delegate* delegate));
+ MOCK_METHOD1(MockBind, void(EulaModel& model));
+ MOCK_METHOD0(MockUnbind, void());
MOCK_METHOD1(OnPasswordFetched, void(const std::string& tpm_password));
private:
- Delegate* delegate_;
+ EulaModel* model_;
};
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/screens/eula_view.h ('k') | chrome/browser/chromeos/login/screens/mock_eula_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698