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

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

Issue 909293002: Properly set ShelfAlignment during login (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 #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 <vector> 8 #include <vector>
9 9
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // Updates |should_lock_screen_before_suspending_|. 74 // Updates |should_lock_screen_before_suspending_|.
75 void SetShouldLockScreenBeforeSuspending(bool should_lock); 75 void SetShouldLockScreenBeforeSuspending(bool should_lock);
76 76
77 // Updates the internal state that indicates whether user adding screen is 77 // Updates the internal state that indicates whether user adding screen is
78 // running now. 78 // running now.
79 void SetUserAddingScreenRunning(bool user_adding_screen_running); 79 void SetUserAddingScreenRunning(bool user_adding_screen_running);
80 80
81 // Setting non NULL image enables avatar icon. 81 // Setting non NULL image enables avatar icon.
82 void SetUserImage(const gfx::ImageSkia& user_image); 82 void SetUserImage(const gfx::ImageSkia& user_image);
83 83
84 // Updates the internal state that indicates the state of the session. Does
tdanderson 2015/02/11 22:59:53 nit: comment unnecessary here, and this can move t
jonross 2015/02/12 15:36:58 Done.
85 // not notify listeners.
86 void set_session_state(SessionState session_state) {
87 session_state_ = session_state;
88 }
89
84 private: 90 private:
85 // Whether a session is in progress and there is an active user. 91 // Whether a session is in progress and there is an active user.
86 bool has_active_user_; 92 bool has_active_user_;
87 93
88 // When a user becomes active, the profile and browser UI are not immediately 94 // When a user becomes active, the profile and browser UI are not immediately
89 // available. Only once this flag becomes |true| is the browser startup 95 // available. Only once this flag becomes |true| is the browser startup
90 // complete and both profile and UI are fully available. 96 // complete and both profile and UI are fully available.
91 bool active_user_session_started_; 97 bool active_user_session_started_;
92 98
93 // Whether the screen can be locked. Locking will only actually be allowed 99 // Whether the screen can be locked. Locking will only actually be allowed
(...skipping 10 matching lines...) Expand all
104 bool user_adding_screen_running_; 110 bool user_adding_screen_running_;
105 111
106 // The number of users logged in. 112 // The number of users logged in.
107 int logged_in_users_; 113 int logged_in_users_;
108 114
109 // The index for the activated user. 115 // The index for the activated user.
110 int active_user_index_; 116 int active_user_index_;
111 117
112 std::vector<MockUserInfo*> user_list_; 118 std::vector<MockUserInfo*> user_list_;
113 119
120 // The current state of the login screen. |session_state_| becomes active
121 // before the profile and browser UI are available.
122 SessionState session_state_;
123
114 DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate); 124 DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
115 }; 125 };
116 126
117 } // namespace test 127 } // namespace test
118 } // namespace ash 128 } // namespace ash
119 129
120 #endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ 130 #endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698