WizardScreen is merged to BaseScreen.

chrome/browser/chromeos/login/screens/network_screen.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 22 matching lines @@
 // NetworkScreen, public:
 
 // static
 NetworkScreen* NetworkScreen::Get(ScreenManager* manager) {
   return static_cast<NetworkScreen*>(
       manager->GetScreen(WizardController::kNetworkScreenName));
 }
 
 NetworkScreen::NetworkScreen(ScreenObserver* screen_observer,
                              NetworkScreenActor* actor)
-    : WizardScreen(screen_observer),
+    : BaseScreen(screen_observer),
       is_network_subscribed_(false),
       continue_pressed_(false),
       actor_(actor),
       network_state_helper_(new login::NetworkStateHelper) {
   DCHECK(actor_);
   if (actor_)
     actor_->SetDelegate(this);
 }
 
 NetworkScreen::~NetworkScreen() {
   if (actor_)
     actor_->SetDelegate(NULL);
   connection_timer_.Stop();
   UnsubscribeNetworkNotification();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NetworkScreen, WizardScreen implementation:
+// NetworkScreen, BaseScreen implementation:
 
 void NetworkScreen::PrepareToShow() {
   if (actor_)
     actor_->PrepareToShow();
 }
 
 void NetworkScreen::Show() {
   Refresh();
   if (actor_)
     actor_->Show();
@@ skipping 132 matching lines @@
   }
 
   network_id_ = network_id;
   if (actor_) {
     actor_->ShowConnectingStatus(continue_pressed_, network_id_);
     actor_->EnableContinue(false);
   }
 }
 
 }  // namespace chromeos