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

Unified Diff: components/arc/net/arc_net_host_impl.cc

Issue 2756673003: arc: Update device owner check implementation (Closed)
Patch Set: Add CrBug number Created 3 years, 9 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
« no previous file with comments | « components/arc/net/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/net/arc_net_host_impl.cc
diff --git a/components/arc/net/arc_net_host_impl.cc b/components/arc/net/arc_net_host_impl.cc
index b6f497d0b1902e9d9fb5863bf5c1a9ddbbb7af7c..05cb78d126c644520e28f4b5172c27ffe3bc7d7a 100644
--- a/components/arc/net/arc_net_host_impl.cc
+++ b/components/arc/net/arc_net_host_impl.cc
@@ -24,6 +24,7 @@
#include "chromeos/network/network_util.h"
#include "chromeos/network/onc/onc_utils.h"
#include "components/arc/arc_bridge_service.h"
+#include "components/user_manager/user_manager.h"
namespace {
@@ -43,10 +44,12 @@ chromeos::NetworkConnectionHandler* GetNetworkConnectionHandler() {
}
bool IsDeviceOwner() {
- // Check whether the logged-in Chrome OS user is allowed to add or
- // remove WiFi networks.
- return chromeos::LoginState::Get()->GetLoggedInUserType() ==
- chromeos::LoginState::LOGGED_IN_USER_OWNER;
+ // Check whether the logged-in Chrome OS user is allowed to add or remove WiFi
+ // networks. The user account state changes immediately after boot. There is a
+ // small window when this may return an incorrect state. However, after things
+ // settle down this is guranteed to reflect the correct user account state.
+ return user_manager::UserManager::Get()->GetActiveUser()->GetAccountId() ==
+ user_manager::UserManager::Get()->GetOwnerAccountId();
}
std::string GetStringFromOncDictionary(const base::DictionaryValue* dict,
« no previous file with comments | « components/arc/net/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698