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

Side by Side Diff: ash/test/test_session_state_delegate.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/test/test_session_state_delegate.h" 5 #include "ash/test/test_session_state_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 MultiProfileIndex index) { 98 MultiProfileIndex index) {
99 return NULL; 99 return NULL;
100 } 100 }
101 101
102 content::BrowserContext* 102 content::BrowserContext*
103 TestSessionStateDelegate::GetBrowserContextForWindow( 103 TestSessionStateDelegate::GetBrowserContextForWindow(
104 aura::Window* window) { 104 aura::Window* window) {
105 return NULL; 105 return NULL;
106 } 106 }
107 107
108 const std::string& TestSessionStateDelegate::GetUserPresentingWindow(
109 aura::Window* window) {
110 return base::EmptyString();
111 }
112
108 int TestSessionStateDelegate::GetMaximumNumberOfLoggedInUsers() const { 113 int TestSessionStateDelegate::GetMaximumNumberOfLoggedInUsers() const {
109 return 3; 114 return 3;
110 } 115 }
111 116
112 int TestSessionStateDelegate::NumberOfLoggedInUsers() const { 117 int TestSessionStateDelegate::NumberOfLoggedInUsers() const {
113 // TODO(skuhne): Add better test framework to test multiple profiles. 118 // TODO(skuhne): Add better test framework to test multiple profiles.
114 return has_active_user_ ? logged_in_users_ : 0; 119 return has_active_user_ ? logged_in_users_ : 0;
115 } 120 }
116 121
117 bool TestSessionStateDelegate::IsActiveUserSessionStarted() const { 122 bool TestSessionStateDelegate::IsActiveUserSessionStarted() const {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 void TestSessionStateDelegate::AddSessionStateObserver( 241 void TestSessionStateDelegate::AddSessionStateObserver(
237 SessionStateObserver* observer) { 242 SessionStateObserver* observer) {
238 } 243 }
239 244
240 void TestSessionStateDelegate::RemoveSessionStateObserver( 245 void TestSessionStateDelegate::RemoveSessionStateObserver(
241 SessionStateObserver* observer) { 246 SessionStateObserver* observer) {
242 } 247 }
243 248
244 } // namespace test 249 } // namespace test
245 } // namespace ash 250 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698