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

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

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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_NETWORK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_NETWORK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_NETWORK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_NETWORK_SCREEN_H_
7 7
8 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
8 #include "chrome/browser/chromeos/login/screens/network_screen.h" 9 #include "chrome/browser/chromeos/login/screens/network_screen.h"
9 #include "chrome/browser/chromeos/login/screens/network_screen_actor.h" 10 #include "chrome/browser/chromeos/login/screens/network_screen_actor.h"
10 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 12
13 namespace chromeos { 13 namespace chromeos {
14 14
15 class MockNetworkScreen : public NetworkScreen { 15 class MockNetworkScreen : public NetworkScreen {
16 public: 16 public:
17 MockNetworkScreen(ScreenObserver* observer, NetworkScreenActor* actor); 17 MockNetworkScreen(BaseScreenDelegate* base_screen_delegate,
18 NetworkScreenActor* actor);
18 virtual ~MockNetworkScreen(); 19 virtual ~MockNetworkScreen();
19 }; 20 };
20 21
21 class MockNetworkScreenActor : public NetworkScreenActor { 22 class MockNetworkScreenActor : public NetworkScreenActor {
22 public: 23 public:
23 MockNetworkScreenActor(); 24 MockNetworkScreenActor();
24 virtual ~MockNetworkScreenActor(); 25 virtual ~MockNetworkScreenActor();
25 26
26 virtual void SetDelegate(Delegate* delegate); 27 virtual void SetDelegate(Delegate* delegate);
27 28
(...skipping 14 matching lines...) Expand all
42 MOCK_METHOD1(SetTimezone, void(const std::string& timezone)); 43 MOCK_METHOD1(SetTimezone, void(const std::string& timezone));
43 44
44 private: 45 private:
45 Delegate* delegate_; 46 Delegate* delegate_;
46 47
47 }; 48 };
48 49
49 } // namespace chromeos 50 } // namespace chromeos
50 51
51 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_NETWORK_SCREEN_H_ 52 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_NETWORK_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698