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

Side by Side Diff: ash/test/test_session_state_delegate.h

Issue 19945004: Modal window in user session not blocks user adding screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compilation for win. Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
6 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ 6 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
7 7
8 #include "ash/session_state_delegate.h" 8 #include "ash/session_state_delegate.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 11 matching lines...) Expand all
22 const std::string& get_activated_user() { return activated_user_; } 22 const std::string& get_activated_user() { return activated_user_; }
23 23
24 // SessionStateDelegate: 24 // SessionStateDelegate:
25 virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE; 25 virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
26 virtual int NumberOfLoggedInUsers() const OVERRIDE; 26 virtual int NumberOfLoggedInUsers() const OVERRIDE;
27 virtual bool IsActiveUserSessionStarted() const OVERRIDE; 27 virtual bool IsActiveUserSessionStarted() const OVERRIDE;
28 virtual bool CanLockScreen() const OVERRIDE; 28 virtual bool CanLockScreen() const OVERRIDE;
29 virtual bool IsScreenLocked() const OVERRIDE; 29 virtual bool IsScreenLocked() const OVERRIDE;
30 virtual void LockScreen() OVERRIDE; 30 virtual void LockScreen() OVERRIDE;
31 virtual void UnlockScreen() OVERRIDE; 31 virtual void UnlockScreen() OVERRIDE;
32 virtual bool IsUserSessionBlocked() const OVERRIDE;
32 virtual const base::string16 GetUserDisplayName( 33 virtual const base::string16 GetUserDisplayName(
33 ash::MultiProfileIndex index) const OVERRIDE; 34 ash::MultiProfileIndex index) const OVERRIDE;
34 virtual const std::string GetUserEmail( 35 virtual const std::string GetUserEmail(
35 ash::MultiProfileIndex index) const OVERRIDE; 36 ash::MultiProfileIndex index) const OVERRIDE;
36 virtual const gfx::ImageSkia& GetUserImage( 37 virtual const gfx::ImageSkia& GetUserImage(
37 ash::MultiProfileIndex index) const OVERRIDE; 38 ash::MultiProfileIndex index) const OVERRIDE;
38 virtual void GetLoggedInUsers(UserIdList* users) OVERRIDE; 39 virtual void GetLoggedInUsers(UserIdList* users) OVERRIDE;
39 virtual void SwitchActiveUser(const std::string& email) OVERRIDE; 40 virtual void SwitchActiveUser(const std::string& email) OVERRIDE;
40 virtual void AddSessionStateObserver( 41 virtual void AddSessionStateObserver(
41 ash::SessionStateObserver* observer) OVERRIDE; 42 ash::SessionStateObserver* observer) OVERRIDE;
(...skipping 12 matching lines...) Expand all
54 // fully started for the active user. If |active_user_session_started| is 55 // fully started for the active user. If |active_user_session_started| is
55 // |true|, |has_active_user_| is set to |true| as well (see below for the 56 // |true|, |has_active_user_| is set to |true| as well (see below for the
56 // difference between these two flags). 57 // difference between these two flags).
57 void SetActiveUserSessionStarted(bool active_user_session_started); 58 void SetActiveUserSessionStarted(bool active_user_session_started);
58 59
59 // Updates the internal state that indicates whether the screen can be locked. 60 // Updates the internal state that indicates whether the screen can be locked.
60 // Locking will only actually be allowed when this value is |true| and there 61 // Locking will only actually be allowed when this value is |true| and there
61 // is an active user. 62 // is an active user.
62 void SetCanLockScreen(bool can_lock_screen); 63 void SetCanLockScreen(bool can_lock_screen);
63 64
65 // Updates the internal state that indicates whether user adding screen is
66 // running now.
67 void SetUserAddingScreenRunning(bool user_adding_screen_running);
68
64 private: 69 private:
65 // Whether a session is in progress and there is an active user. 70 // Whether a session is in progress and there is an active user.
66 bool has_active_user_; 71 bool has_active_user_;
67 72
68 // When a user becomes active, the profile and browser UI are not immediately 73 // When a user becomes active, the profile and browser UI are not immediately
69 // available. Only once this flag becomes |true| is the browser startup 74 // available. Only once this flag becomes |true| is the browser startup
70 // complete and both profile and UI are fully available. 75 // complete and both profile and UI are fully available.
71 bool active_user_session_started_; 76 bool active_user_session_started_;
72 77
73 // Whether the screen can be locked. Locking will only actually be allowed 78 // Whether the screen can be locked. Locking will only actually be allowed
74 // when this is |true| and there is an active user. 79 // when this is |true| and there is an active user.
75 bool can_lock_screen_; 80 bool can_lock_screen_;
76 81
77 // Whether the screen is currently locked. 82 // Whether the screen is currently locked.
78 bool screen_locked_; 83 bool screen_locked_;
79 84
85 // Whether user addding screen is running now.
86 bool user_adding_screen_running_;
87
80 // The number of users logged in. 88 // The number of users logged in.
81 int logged_in_users_; 89 int logged_in_users_;
82 90
83 // The activated user. 91 // The activated user.
84 std::string activated_user_; 92 std::string activated_user_;
85 93
86 // A test user image. 94 // A test user image.
87 gfx::ImageSkia null_image_; 95 gfx::ImageSkia null_image_;
88 96
89 DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate); 97 DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
90 }; 98 };
91 99
92 } // namespace test 100 } // namespace test
93 } // namespace ash 101 } // namespace ash
94 102
95 #endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ 103 #endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698