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

Side by Side Diff: chrome/browser/chromeos/login/screens/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_NETWORK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "chrome/browser/chromeos/login/screens/base_screen.h" 13 #include "chrome/browser/chromeos/login/screens/base_screen.h"
14 #include "chrome/browser/chromeos/login/screens/network_screen_actor.h" 14 #include "chrome/browser/chromeos/login/screens/network_screen_actor.h"
15 #include "chromeos/network/network_state_handler_observer.h" 15 #include "chromeos/network/network_state_handler_observer.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 class ScreenManager; 19 class ScreenManager;
20 20
21 namespace login { 21 namespace login {
22 class NetworkStateHelper; 22 class NetworkStateHelper;
23 } // namespace login 23 } // namespace login
24 24
25 class NetworkScreen : public BaseScreen, 25 class NetworkScreen : public BaseScreen,
26 public NetworkStateHandlerObserver, 26 public NetworkStateHandlerObserver,
27 public NetworkScreenActor::Delegate { 27 public NetworkScreenActor::Delegate {
28 public: 28 public:
29 NetworkScreen(ScreenObserver* screen_observer, NetworkScreenActor* actor); 29 NetworkScreen(BaseScreenDelegate* base_screen_delegate,
30 NetworkScreenActor* actor);
30 virtual ~NetworkScreen(); 31 virtual ~NetworkScreen();
31 32
32 static NetworkScreen* Get(ScreenManager* manager); 33 static NetworkScreen* Get(ScreenManager* manager);
33 34
34 // BaseScreen implementation: 35 // BaseScreen implementation:
35 virtual void PrepareToShow() override; 36 virtual void PrepareToShow() override;
36 virtual void Show() override; 37 virtual void Show() override;
37 virtual void Hide() override; 38 virtual void Hide() override;
38 virtual std::string GetName() const override; 39 virtual std::string GetName() const override;
39 40
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 99
99 NetworkScreenActor* actor_; 100 NetworkScreenActor* actor_;
100 scoped_ptr<login::NetworkStateHelper> network_state_helper_; 101 scoped_ptr<login::NetworkStateHelper> network_state_helper_;
101 102
102 DISALLOW_COPY_AND_ASSIGN(NetworkScreen); 103 DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
103 }; 104 };
104 105
105 } // namespace chromeos 106 } // namespace chromeos
106 107
107 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_ 108 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/mock_update_screen.cc ('k') | chrome/browser/chromeos/login/screens/network_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698