Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

chrome/browser/chromeos/options/network_config_view.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/options/network_config_view.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
+#include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_property_ui_data.h"
 #include "chrome/browser/chromeos/options/vpn_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 #include "chrome/browser/chromeos/options/wimax_config_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 10 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using views::Widget;
 
+namespace chromeos {
+
 namespace {
 
 gfx::NativeWindow GetParentForUnhostedDialog() {
-  if (chromeos::LoginDisplayHostImpl::default_host()) {
-    return chromeos::LoginDisplayHostImpl::default_host()->GetNativeWindow();
+  if (LoginDisplayHost::default_host()) {
+    return LoginDisplayHost::default_host()->GetNativeWindow();
   } else {
     Browser* browser = chrome::FindTabbedBrowser(
         ProfileManager::GetPrimaryUserProfile(),
         true,
         chrome::HOST_DESKTOP_TYPE_ASH);
     if (browser)
       return browser->window()->GetNativeWindow();
   }
-  return NULL;
+  return nullptr;
 }
 
 // Avoid global static initializer.
-chromeos::NetworkConfigView** GetActiveDialogPointer() {
-  static chromeos::NetworkConfigView* active_dialog = NULL;
+NetworkConfigView** GetActiveDialogPointer() {
+  static NetworkConfigView* active_dialog = nullptr;
   return &active_dialog;
 }
 
-chromeos::NetworkConfigView* GetActiveDialog() {
+NetworkConfigView* GetActiveDialog() {
   return *(GetActiveDialogPointer());
 }
 
-void SetActiveDialog(chromeos::NetworkConfigView* dialog) {
+void SetActiveDialog(NetworkConfigView* dialog) {
   *(GetActiveDialogPointer()) = dialog;
 }
 
 }  // namespace
 
-namespace chromeos {
-
 // static
 const int ChildNetworkConfigView::kInputFieldMinWidth = 270;
 
 NetworkConfigView::NetworkConfigView()
-    : child_config_view_(NULL),
-      delegate_(NULL),
-      advanced_button_(NULL) {
-  DCHECK(GetActiveDialog() == NULL);
+    : child_config_view_(nullptr),
+      delegate_(nullptr),
+      advanced_button_(nullptr) {
+  DCHECK(GetActiveDialog() == nullptr);
   SetActiveDialog(this);
 }
 
 bool NetworkConfigView::InitWithNetworkState(const NetworkState* network) {
   DCHECK(network);
   std::string service_path = network->path();
   if (network->type() == shill::kTypeWifi ||
       network->type() == shill::kTypeEthernet) {
     child_config_view_ = new WifiConfigView(this, service_path, false);
   } else if (network->type() == shill::kTypeWimax) {
     child_config_view_ = new WimaxConfigView(this, service_path);
   } else if (network->type() == shill::kTypeVPN) {
     child_config_view_ = new VPNConfigView(this, service_path);
   }
-  return child_config_view_ != NULL;
+  return child_config_view_ != nullptr;
 }
 
 bool NetworkConfigView::InitWithType(const std::string& type) {
   if (type == shill::kTypeWifi) {
     child_config_view_ = new WifiConfigView(this,
                                             "" /* service_path */,
                                             false /* show_8021x */);
     advanced_button_ = new views::LabelButton(this, l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ADVANCED_BUTTON));
     advanced_button_->SetStyle(views::Button::STYLE_BUTTON);
   } else if (type == shill::kTypeVPN) {
     child_config_view_ = new VPNConfigView(this,
                                            "" /* service_path */);
   }
-  return child_config_view_ != NULL;
+  return child_config_view_ != nullptr;
 }
 
 NetworkConfigView::~NetworkConfigView() {
   DCHECK(GetActiveDialog() == this);
-  SetActiveDialog(NULL);
+  SetActiveDialog(nullptr);
 }
 
 // static
 void NetworkConfigView::Show(const std::string& service_path,
                              gfx::NativeWindow parent) {
-  if (GetActiveDialog() != NULL)
+  if (GetActiveDialog() != nullptr)
     return;
   NetworkConfigView* view = new NetworkConfigView();
   const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
       GetNetworkState(service_path);
   if (!network) {
     LOG(ERROR) << "NetworkConfigView::Show called with invalid service_path";
     return;
   }
   if (!view->InitWithNetworkState(network)) {
     LOG(ERROR) << "NetworkConfigView::Show called with invalid network type: "
                << network->type();
     delete view;
     return;
   }
   NET_LOG(USER) << "NetworkConfigView::Show: " << service_path;
   view->ShowDialog(parent);
 }
 
 // static
 void NetworkConfigView::ShowForType(const std::string& type,
                                     gfx::NativeWindow parent) {
-  if (GetActiveDialog() != NULL)
+  if (GetActiveDialog() != nullptr)
     return;
   NetworkConfigView* view = new NetworkConfigView();
   if (!view->InitWithType(type)) {
     LOG(ERROR) << "NetworkConfigView::ShowForType called with invalid type: "
                << type;
     delete view;
     return;
   }
   NET_LOG(USER) << "NetworkConfigView::ShowForType: " << type;
   view->ShowDialog(parent);
@@ skipping 111 matching lines @@
     const ViewHierarchyChangedDetails& details) {
   // Can't init before we're inserted into a Container, because we require
   // a HWND to parent native child controls to.
   views::DialogDelegateView::ViewHierarchyChanged(details);
   if (details.is_add && details.child == this) {
     AddChildView(child_config_view_);
   }
 }
 
 void NetworkConfigView::ShowDialog(gfx::NativeWindow parent) {
-  if (parent == NULL)
+  if (parent == nullptr)
     parent = GetParentForUnhostedDialog();
   // Failed connections may result in a pop-up with no natural parent window,
   // so provide a fallback context on the primary display. This is necessary
-  // becase one of parent or context must be non NULL.
+  // becase one of parent or context must be non nullptr.
   gfx::NativeWindow context =
-      parent ? NULL : ash::Shell::GetPrimaryRootWindow();
+      parent ? nullptr : ash::Shell::GetPrimaryRootWindow();
   Widget* window = DialogDelegate::CreateDialogWidget(this, context, parent);
   window->SetAlwaysOnTop(true);
   window->Show();
 }
 
 // ChildNetworkConfigView
 
 ChildNetworkConfigView::ChildNetworkConfigView(
     NetworkConfigView* parent,
     const std::string& service_path)
@@ skipping 12 matching lines @@
 void ChildNetworkConfigView::GetShareStateForLoginState(bool* default_value,
                                                         bool* modifiable) {
   *default_value = !LoginState::Get()->UserHasNetworkProfile();
   // Allow only authenticated user to change the share state.
   *modifiable = LoginState::Get()->IsUserAuthenticated();
 }
 
 // ControlledSettingIndicatorView
 
 ControlledSettingIndicatorView::ControlledSettingIndicatorView()
-    : managed_(false),
-      image_view_(NULL) {
+    : managed_(false), image_view_(nullptr) {
   Init();
 }
 
 ControlledSettingIndicatorView::ControlledSettingIndicatorView(
     const NetworkPropertyUIData& ui_data)
-    : managed_(false),
-      image_view_(NULL) {
+    : managed_(false), image_view_(nullptr) {
   Init();
   Update(ui_data);
 }
 
 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {}
 
 void ControlledSettingIndicatorView::Update(
     const NetworkPropertyUIData& ui_data) {
   if (managed_ == ui_data.IsManaged())
     return;
@@ skipping 18 matching lines @@
   image_view_ = new views::ImageView();
   // Disable |image_view_| so mouse events propagate to the parent.
   image_view_->SetEnabled(false);
   image_view_->SetImage(image_);
   image_view_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
   AddChildView(image_view_);
 }
 
 }  // namespace chromeos