[cros] Cleanup: remove LoginUtils

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/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/network_view.h"
 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/network/network_handler.h"
@@ skipping 26 matching lines @@
       is_network_subscribed_(false),
       continue_pressed_(false),
       view_(view),
       delegate_(delegate),
       network_state_helper_(new login::NetworkStateHelper),
       weak_factory_(this) {
   if (view_)
     view_->Bind(*this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
+  InitializeTimezoneObserver();
+}
 
+void NetworkScreen::InitializeTimezoneObserver() {
   timezone_subscription_ = CrosSettings::Get()->AddSettingsObserver(
       kSystemTimezone, base::Bind(&NetworkScreen::OnSystemTimezoneChanged,
                                   base::Unretained(this)));
 }
 
 NetworkScreen::~NetworkScreen() {
   if (view_)
     view_->Unbind();
   connection_timer_.Stop();
   UnsubscribeNetworkNotification();
@@ skipping 14 matching lines @@
 
   // Here we should handle default locales, for which we do not have UI
   // resources. This would load fallback, but properly show "selected" locale
   // in the UI.
   if (selected_language_code_.empty()) {
     const StartupCustomizationDocument* startup_manifest =
         StartupCustomizationDocument::GetInstance();
     SetApplicationLocale(startup_manifest->initial_locale_default());
   }
 
+  if (!timezone_subscription_)
+    InitializeTimezoneObserver();
+
   if (view_)
     view_->Show();
 }
 
 void NetworkScreen::Hide() {
+  timezone_subscription_.reset();
   if (view_)
     view_->Hide();
 }
 
 void NetworkScreen::Initialize(::login::ScreenContext* context) {
   NetworkModel::Initialize(context);
   OnSystemTimezoneChanged();
   UpdateLanguageList();
 }
 
@@ skipping 263 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, OnLanguageListReloaded());
 }
 
 void NetworkScreen::OnSystemTimezoneChanged() {
   std::string current_timezone_id;
   CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
   GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id);
 }
 
 }  // namespace chromeos