Move default_host from LoginDisplayHostImpl to LoginDisplayHost.

chrome/browser/chromeos/login/ui/login_display_host_impl.cc

 // Copyright 2014 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/ui/login_display_host_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/audio/sounds.h"
@@ skipping 231 matching lines @@
 void ResetKeyboardOverscrollOverride() {
   keyboard::SetKeyboardOverscrollOverride(
       keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_NONE);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 // static
-LoginDisplayHost* LoginDisplayHostImpl::default_host_ = NULL;
-
-// static
 const int LoginDisplayHostImpl::kShowLoginWebUIid = 0x1111;
 
 ////////////////////////////////////////////////////////////////////////////////
 // LoginDisplayHostImpl, public
 
 LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
     : background_bounds_(background_bounds),
       shutting_down_(false),
       oobe_progress_bar_visible_(false),
       session_starting_(false),
@@ skipping 34 matching lines @@
   // a browser window exists and the window can acquire input focus.
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_OPENED,
                  content::NotificationService::AllSources());
 
   // Login screen is moved to lock screen container when user logs in.
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                  content::NotificationService::AllSources());
 
-  DCHECK(default_host_ == NULL);
+  DCHECK(default_host() == nullptr);
   default_host_ = this;
 
   // Make sure chrome won't exit while we are at login/oobe screen.
   chrome::IncrementKeepAliveCount();
 
   bool is_registered = StartupUtils::IsDeviceRegistered();
   bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
   bool disable_boot_animation =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableBootAnimation);
@@ skipping 75 matching lines @@
     login_window_->RemoveRemovalsObserver(this);
 
   ResetKeyboardOverscrollOverride();
 
   views::FocusManager::set_arrow_key_traversal_enabled(false);
   ResetLoginWindowAndView();
 
   // Let chrome process exit after login/oobe screen if needed.
   chrome::DecrementKeepAliveCount();
 
-  default_host_ = NULL;
+  default_host_ = nullptr;
   // TODO(tengs): This should be refactored. See crbug.com/314934.
   if (user_manager::UserManager::Get()->IsCurrentUserNew()) {
     // DriveOptInController will delete itself when finished.
     (new DriveFirstRunController(
         ProfileManager::GetActiveUserProfile()))->EnableOfflineMode();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LoginDisplayHostImpl, LoginDisplayHost implementation:
@@ skipping 851 matching lines @@
 
   locale_util::SwitchLanguageCallback callback(
       base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
 
   // Load locale keyboards here. Hardware layout would be automatically enabled.
   locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
                               callback, ProfileManager::GetActiveUserProfile());
 }
 
 }  // namespace chromeos