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

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

Issue 7774009: [cros] check for updates in WebUI OOBE can be cancelled in dev builds. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Added OnActorDestroyed to UpdateScreen::Delegate. Created 9 years, 4 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
« no previous file with comments | « chrome/browser/chromeos/login/mock_update_screen.h ('k') | chrome/browser/chromeos/login/update_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/mock_update_screen.cc
diff --git a/chrome/browser/chromeos/login/mock_update_screen.cc b/chrome/browser/chromeos/login/mock_update_screen.cc
index 703f705a6bec7d471452730c90408ace7787df2d..246ed439877d6aff608ffd49dd1841f4196b6400 100644
--- a/chrome/browser/chromeos/login/mock_update_screen.cc
+++ b/chrome/browser/chromeos/login/mock_update_screen.cc
@@ -6,6 +6,9 @@
namespace chromeos {
+using ::testing::AtLeast;
+using ::testing::NotNull;
+
MockUpdateScreen::MockUpdateScreen(ScreenObserver* screen_observer,
UpdateScreenActor* actor)
: UpdateScreen(screen_observer, actor) {
@@ -14,10 +17,19 @@ MockUpdateScreen::MockUpdateScreen(ScreenObserver* screen_observer,
MockUpdateScreen::~MockUpdateScreen() {
}
-MockUpdateScreenActor::MockUpdateScreenActor() {
+MockUpdateScreenActor::MockUpdateScreenActor()
+ : screen_(NULL) {
+ EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
}
MockUpdateScreenActor::~MockUpdateScreenActor() {
+ if (screen_)
+ screen_->OnActorDestroyed(this);
+}
+
+void MockUpdateScreenActor::SetDelegate(UpdateScreenActor::Delegate* screen) {
+ screen_ = screen;
+ MockSetDelegate(screen);
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/mock_update_screen.h ('k') | chrome/browser/chromeos/login/update_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698