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

Side by Side Diff: chrome/browser/chromeos/login/screens/mock_update_screen.cc

Issue 2673943002: Fold UpdateModel into UpdateScreen. (Closed)
Patch Set: Address comments Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/screens/mock_update_screen.h" 5 #include "chrome/browser/chromeos/login/screens/mock_update_screen.h"
6 6
7 using ::testing::AtLeast; 7 using ::testing::AtLeast;
8 using ::testing::_; 8 using ::testing::_;
9 9
10 namespace chromeos { 10 namespace chromeos {
11 11
12 MockUpdateScreen::MockUpdateScreen(BaseScreenDelegate* base_screen_delegate, 12 MockUpdateScreen::MockUpdateScreen(BaseScreenDelegate* base_screen_delegate,
13 UpdateView* view) 13 UpdateView* view)
14 : UpdateScreen(base_screen_delegate, view, NULL) { 14 : UpdateScreen(base_screen_delegate, view, NULL) {
15 } 15 }
16 16
17 MockUpdateScreen::~MockUpdateScreen() { 17 MockUpdateScreen::~MockUpdateScreen() {
18 } 18 }
19 19
20 MockUpdateView::MockUpdateView() : model_(nullptr) { 20 MockUpdateView::MockUpdateView() {
21 EXPECT_CALL(*this, MockBind(_)).Times(AtLeast(1)); 21 EXPECT_CALL(*this, MockBind(_)).Times(AtLeast(1));
22 } 22 }
23 23
24 MockUpdateView::~MockUpdateView() { 24 MockUpdateView::~MockUpdateView() {
25 if (model_) 25 if (screen_)
26 model_->OnViewDestroyed(this); 26 screen_->OnViewDestroyed(this);
27 } 27 }
28 28
29 void MockUpdateView::Bind(UpdateModel& model) { 29 void MockUpdateView::Bind(UpdateScreen* screen) {
30 model_ = &model; 30 screen_ = screen;
31 MockBind(model); 31 MockBind(screen);
32 } 32 }
33 33
34 void MockUpdateView::Unbind() { 34 void MockUpdateView::Unbind() {
35 model_ = nullptr; 35 screen_ = nullptr;
36 MockUnbind(); 36 MockUnbind();
37 } 37 }
38 38
39 } // namespace chromeos 39 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/mock_update_screen.h ('k') | chrome/browser/chromeos/login/screens/update_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698