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

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

Issue 1053013007: Minimized windows should not be activated by another user in multiprofile scenario. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/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 9b1edd275b5fe1d6da7d3ddc9f3727a3eb772e2f..5fb741930f7e7e58c56488e3a39a3ce4f51513e2 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
@@ -66,8 +66,14 @@ SessionStateDelegateChromeos::GetBrowserContextForWindow(
chrome::MultiUserWindowManager::GetInstance()->GetWindowOwner(window);
const user_manager::User* user =
user_manager::UserManager::Get()->FindUser(user_id);
- DCHECK(user);
- return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
oshima 2015/04/07 19:53:44 why this change?
xdai1 2015/04/09 17:22:40 In Login screen, we might fail this check since th
oshima 2015/04/09 17:50:48 Why this wasn't an issue before? Do you think this
xdai1 2015/04/09 22:45:25 Because in this fix we will call this GetBrowserCo
oshima 2015/04/10 20:39:48 what kind of "user_id" would you get if it's in lo
+ return user ? (chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user))
+ : NULL;
+}
+
+const std::string& SessionStateDelegateChromeos::GetUserPresentingWindow(
+ aura::Window* window) {
+ return chrome::MultiUserWindowManager::GetInstance()->GetUserPresentingWindow(
+ window);
}
int SessionStateDelegateChromeos::GetMaximumNumberOfLoggedInUsers() const {

Powered by Google App Engine
This is Rietveld 408576698