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

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

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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/shelf_test_api.cc ('k') | ash/test/test_shelf_delegate.h » ('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 #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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 bool TestSessionStateDelegate::IsUserSessionBlocked() const { 78 bool TestSessionStateDelegate::IsUserSessionBlocked() const {
79 return !IsActiveUserSessionStarted() || IsScreenLocked() || 79 return !IsActiveUserSessionStarted() || IsScreenLocked() ||
80 user_adding_screen_running_; 80 user_adding_screen_running_;
81 } 81 }
82 82
83 void TestSessionStateDelegate::SetHasActiveUser(bool has_active_user) { 83 void TestSessionStateDelegate::SetHasActiveUser(bool has_active_user) {
84 has_active_user_ = has_active_user; 84 has_active_user_ = has_active_user;
85 if (!has_active_user) 85 if (!has_active_user)
86 active_user_session_started_ = false; 86 active_user_session_started_ = false;
87 else 87 else
88 Shell::GetInstance()->ShowLauncher(); 88 Shell::GetInstance()->ShowShelf();
89 } 89 }
90 90
91 void TestSessionStateDelegate::SetActiveUserSessionStarted( 91 void TestSessionStateDelegate::SetActiveUserSessionStarted(
92 bool active_user_session_started) { 92 bool active_user_session_started) {
93 active_user_session_started_ = active_user_session_started; 93 active_user_session_started_ = active_user_session_started;
94 if (active_user_session_started) { 94 if (active_user_session_started) {
95 has_active_user_ = true; 95 has_active_user_ = true;
96 Shell::GetInstance()->CreateLauncher(); 96 Shell::GetInstance()->CreateShelf();
97 Shell::GetInstance()->UpdateAfterLoginStatusChange( 97 Shell::GetInstance()->UpdateAfterLoginStatusChange(
98 user::LOGGED_IN_USER); 98 user::LOGGED_IN_USER);
99 } 99 }
100 } 100 }
101 101
102 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) { 102 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) {
103 can_lock_screen_ = can_lock_screen; 103 can_lock_screen_ = can_lock_screen;
104 } 104 }
105 105
106 void TestSessionStateDelegate::SetShouldLockScreenBeforeSuspending( 106 void TestSessionStateDelegate::SetShouldLockScreenBeforeSuspending(
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 bool TestSessionStateDelegate::TransferWindowToDesktopOfUser( 162 bool TestSessionStateDelegate::TransferWindowToDesktopOfUser(
163 aura::Window* window, 163 aura::Window* window,
164 ash::MultiProfileIndex index) { 164 ash::MultiProfileIndex index) {
165 num_transfer_to_desktop_of_user_calls_++; 165 num_transfer_to_desktop_of_user_calls_++;
166 return false; 166 return false;
167 } 167 }
168 168
169 } // namespace test 169 } // namespace test
170 } // namespace ash 170 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shelf_test_api.cc ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698