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

Unified Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.cc

Issue 473953004: Revert of Multiprofile security: Show a warning messagebox when desktop casting/sharing is turned on upon user (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/session_state_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
index bcf70f4fe6d38cc90649745ae0626654b408e45c..2f7c8405472735753c8d8adf41e5b0f75af54ce7 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
@@ -6,9 +6,6 @@
#include "ash/multi_profile_uma.h"
#include "ash/session/session_state_observer.h"
-#include "ash/system/chromeos/multi_user/user_switch_util.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/prefs/pref_service.h"
@@ -167,7 +164,7 @@
gaia::CanonicalizeEmail(gaia::SanitizeEmail(user_id)));
if (user_id == user_manager::UserManager::Get()->GetActiveUser()->email())
return;
- TryToSwitchUser(user_id);
+ user_manager::UserManager::Get()->SwitchActiveUser(user_id);
}
void SessionStateDelegateChromeos::CycleActiveUser(CycleUser cycle_user) {
@@ -210,7 +207,7 @@
}
// Switch using the transformed |user_id|.
- TryToSwitchUser(user_id);
+ user_manager::UserManager::Get()->SwitchActiveUser(user_id);
}
bool SessionStateDelegateChromeos::IsMultiProfileAllowedByPrimaryUserPolicy()
@@ -270,12 +267,3 @@
session_state_observer_list_,
SessionStateChanged(session_state_));
}
-
-void DoSwitchUser(const std::string& user_id) {
- user_manager::UserManager::Get()->SwitchActiveUser(user_id);
-}
-
-void SessionStateDelegateChromeos::TryToSwitchUser(
- const std::string& user_id) {
- ash::TrySwitchingActiveUser(base::Bind(&DoSwitchUser, user_id));
-}
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698