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

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

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_network_screen.h" 5 #include "chrome/browser/chromeos/login/screens/mock_network_screen.h"
6 6
7 namespace chromeos { 7 namespace chromeos {
8 8
9 using ::testing::AtLeast; 9 using ::testing::AtLeast;
10 using ::testing::NotNull; 10 using ::testing::NotNull;
11 11
12 MockNetworkScreen::MockNetworkScreen(ScreenObserver* observer, 12 MockNetworkScreen::MockNetworkScreen(BaseScreenDelegate* base_screen_delegate,
13 NetworkScreenActor* actor) 13 NetworkScreenActor* actor)
14 : NetworkScreen(observer, actor) { 14 : NetworkScreen(base_screen_delegate, actor) {
15 } 15 }
16 16
17 MockNetworkScreen::~MockNetworkScreen() { 17 MockNetworkScreen::~MockNetworkScreen() {
18 } 18 }
19 19
20 20
21 MockNetworkScreenActor::MockNetworkScreenActor() { 21 MockNetworkScreenActor::MockNetworkScreenActor() {
22 EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1)); 22 EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
23 } 23 }
24 24
25 MockNetworkScreenActor::~MockNetworkScreenActor() { 25 MockNetworkScreenActor::~MockNetworkScreenActor() {
26 if (delegate_) 26 if (delegate_)
27 delegate_->OnActorDestroyed(this); 27 delegate_->OnActorDestroyed(this);
28 } 28 }
29 29
30 void MockNetworkScreenActor::SetDelegate(Delegate* delegate) { 30 void MockNetworkScreenActor::SetDelegate(Delegate* delegate) {
31 delegate_ = delegate; 31 delegate_ = delegate;
32 MockSetDelegate(delegate); 32 MockSetDelegate(delegate);
33 } 33 }
34 34
35 } // namespace chromeos 35 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698