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

Side by Side Diff: chrome/browser/chromeos/login/screens/mock_update_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_UPDATE_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_UPDATE_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_UPDATE_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_UPDATE_SCREEN_H_
7 7
8 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 8 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
9 #include "chrome/browser/chromeos/login/screens/update_screen.h" 9 #include "chrome/browser/chromeos/login/screens/update_screen.h"
10 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h" 10 #include "chrome/browser/chromeos/login/screens/update_screen_actor.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 MockUpdateScreen : public UpdateScreen { 15 class MockUpdateScreen : public UpdateScreen {
16 public: 16 public:
17 MockUpdateScreen(ScreenObserver* screen_observer, UpdateScreenActor* actor); 17 MockUpdateScreen(BaseScreenDelegate* base_screen_delegate,
18 UpdateScreenActor* actor);
18 virtual ~MockUpdateScreen(); 19 virtual ~MockUpdateScreen();
19 20
20 MOCK_METHOD0(StartNetworkCheck, void()); 21 MOCK_METHOD0(StartNetworkCheck, void());
21 }; 22 };
22 23
23 class MockUpdateScreenActor : public UpdateScreenActor { 24 class MockUpdateScreenActor : public UpdateScreenActor {
24 public: 25 public:
25 MockUpdateScreenActor(); 26 MockUpdateScreenActor();
26 virtual ~MockUpdateScreenActor(); 27 virtual ~MockUpdateScreenActor();
27 28
(...skipping 12 matching lines...) Expand all
40 MOCK_METHOD1(ShowCurtain, void(bool enable)); 41 MOCK_METHOD1(ShowCurtain, void(bool enable));
41 MOCK_METHOD1(ShowPreparingUpdatesInfo, void(bool enable)); 42 MOCK_METHOD1(ShowPreparingUpdatesInfo, void(bool enable));
42 43
43 private: 44 private:
44 UpdateScreenActor::Delegate* screen_; 45 UpdateScreenActor::Delegate* screen_;
45 }; 46 };
46 47
47 } // namespace chromeos 48 } // namespace chromeos
48 49
49 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_UPDATE_SCREEN_H_ 50 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_UPDATE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698