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

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

Issue 2642823011: cros: Fold NetworkErrorModel into NetworkErrorView. (Closed)
Patch Set: Address comments Created 3 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_error_screen.h
diff --git a/chrome/browser/chromeos/login/screens/mock_error_screen.h b/chrome/browser/chromeos/login/screens/mock_error_screen.h
index 0a073a05aa6b1b01540b7d954618e8d0513fdcec..e7c3b12e981fcf83538e52a75906b5b1ce6a78d8 100644
--- a/chrome/browser/chromeos/login/screens/mock_error_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_error_screen.h
@@ -7,7 +7,6 @@
#include "chrome/browser/chromeos/login/screens/error_screen.h"
#include "chrome/browser/chromeos/login/screens/network_error.h"
-#include "chrome/browser/chromeos/login/screens/network_error_model.h"
#include "chrome/browser/chromeos/login/screens/network_error_view.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -36,17 +35,17 @@ class MockNetworkErrorView : public NetworkErrorView {
MockNetworkErrorView();
virtual ~MockNetworkErrorView();
- void Bind(NetworkErrorModel& model) override;
+ void Bind(ErrorScreen* screen) override;
void Unbind() override;
MOCK_METHOD0(Show, void());
MOCK_METHOD0(Hide, void());
- MOCK_METHOD1(MockBind, void(NetworkErrorModel& model));
+ MOCK_METHOD1(MockBind, void(ErrorScreen* screen));
MOCK_METHOD0(MockUnbind, void());
MOCK_METHOD1(ShowOobeScreen, void(OobeScreen screen));
private:
- NetworkErrorModel* model_;
+ ErrorScreen* screen_ = nullptr;
};
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/screens/error_screen.cc ('k') | chrome/browser/chromeos/login/screens/mock_error_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698