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

Unified Diff: chrome/browser/chromeos/login/screens/network_screen.h

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/network_screen.h
diff --git a/chrome/browser/chromeos/login/screens/network_screen.h b/chrome/browser/chromeos/login/screens/network_screen.h
index e0e17d90af1e5c87af170b0d6a9e26dbe5ef5930..06419d362f99abdc970319e198a37a5f2301ff94 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.h
+++ b/chrome/browser/chromeos/login/screens/network_screen.h
@@ -6,11 +6,12 @@
#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
#include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string16.h"
#include "base/timer/timer.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/screens/network_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
#include "chromeos/network/network_state_handler_observer.h"
namespace chromeos {
@@ -21,7 +22,7 @@ namespace login {
class NetworkStateHelper;
} // namespace login
-class NetworkScreen : public WizardScreen,
+class NetworkScreen : public BaseScreen,
public NetworkStateHandlerObserver,
public NetworkScreenActor::Delegate {
public:
@@ -30,7 +31,7 @@ class NetworkScreen : public WizardScreen,
static NetworkScreen* Get(ScreenManager* manager);
- // WizardScreen implementation:
+ // BaseScreen implementation:
virtual void PrepareToShow() override;
virtual void Show() override;
virtual void Hide() override;
« no previous file with comments | « chrome/browser/chromeos/login/screens/mock_screen_observer.h ('k') | chrome/browser/chromeos/login/screens/network_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698