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

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

Issue 745613002: [cros] Cleanup: remove LoginUtils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get rid of FakeChromeUserManager usage in ExistingUserController* tests Created 5 years, 10 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.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index 5c65da6fc1b464e7e44d696ff4eb82fbf5ad420f..f451b52e92fc9f425e277e3a6333c137cfc22c4d 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -14,7 +14,6 @@
#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"
@@ -61,7 +60,10 @@ NetworkScreen::NetworkScreen(BaseScreenDelegate* base_screen_delegate,
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)));
@@ -96,11 +98,15 @@ void NetworkScreen::Show() {
SetApplicationLocale(startup_manifest->initial_locale_default());
}
+ if (!timezone_subscription_)
+ InitializeTimezoneObserver();
+
if (view_)
view_->Show();
}
void NetworkScreen::Hide() {
+ timezone_subscription_.reset();
if (view_)
view_->Hide();
}
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen.h ('k') | chrome/browser/chromeos/login/screens/user_image_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698