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

Unified Diff: chrome/browser/chromeos/login/webui_screen_locker.cc

Issue 22264004: Remove ConnectivityStateHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove redundant IsConnected() check Created 7 years, 4 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/webui_screen_locker.cc
diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc
index c5532dfcfa5c23d5c4cc06bc91c9bfe0ec5b06c2..adee217a6fb427ef4a94fab29069e7ff224d9fa6 100644
--- a/chrome/browser/chromeos/login/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/webui_screen_locker.cc
@@ -48,6 +48,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
: ScreenLockerDelegate(screen_locker),
lock_ready_(false),
webui_ready_(false),
+ network_state_helper_(new login::NetworkStateHelper),
weak_factory_(this) {
set_should_emit_login_prompt_visible(false);
ash::Shell::GetInstance()->lock_state_controller()->AddObserver(this);
@@ -200,7 +201,7 @@ void WebUIScreenLocker::CompleteLogin(const UserContext& user_context) {
}
string16 WebUIScreenLocker::GetConnectedNetworkName() {
- return GetCurrentNetworkName();
+ return network_state_helper_->GetCurrentNetworkName();
}
bool WebUIScreenLocker::IsSigninInProgress() const {
« no previous file with comments | « chrome/browser/chromeos/login/webui_screen_locker.h ('k') | chrome/browser/chromeos/net/connectivity_state_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698