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

Unified Diff: ash/system/chromeos/network/network_connect.cc

Issue 60553004: Suppress configure dialog when screen is locked (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/network_connect.cc
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc
index b2b8f84abdf3a1608365d82dd3099d660785cc01..4013c7734972ba5e2996f87cc22a933577181470 100644
--- a/ash/system/chromeos/network/network_connect.cc
+++ b/ash/system/chromeos/network/network_connect.cc
@@ -4,6 +4,7 @@
#include "ash/system/chromeos/network/network_connect.h"
+#include "ash/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/system/chromeos/network/network_state_notifier.h"
#include "ash/system/system_notifier.h"
@@ -155,8 +156,10 @@ void OnConnectFailed(const std::string& service_path,
chromeos::network_handler::kErrorDetail, &shill_error);
ShowErrorNotification(error_name, shill_error, service_path);
- // Show a configure dialog for ConnectFailed errors.
- if (error_name != shill::kErrorConnectFailed)
+ // Only show a configure dialog if there was a ConnectFailed error and the
+ // screen is not locked.
+ if (error_name != shill::kErrorConnectFailed ||
+ Shell::GetInstance()->session_state_delegate()->IsScreenLocked())
return;
// If Shill reports an InProgress error, don't try to configure the network.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698