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

Side by Side Diff: ash/shell/shell_delegate_impl.cc

Issue 783663003: Special check on Supervised User creation flow added to prevent misleading shelf alignment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/default_accessibility_delegate.h" 8 #include "ash/default_accessibility_delegate.h"
9 #include "ash/default_user_wallpaper_delegate.h" 9 #include "ash/default_user_wallpaper_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 screen_locked_ = true; 102 screen_locked_ = true;
103 Shell::GetInstance()->UpdateShelfVisibility(); 103 Shell::GetInstance()->UpdateShelfVisibility();
104 } 104 }
105 void UnlockScreen() override { 105 void UnlockScreen() override {
106 screen_locked_ = false; 106 screen_locked_ = false;
107 Shell::GetInstance()->UpdateShelfVisibility(); 107 Shell::GetInstance()->UpdateShelfVisibility();
108 } 108 }
109 bool IsUserSessionBlocked() const override { 109 bool IsUserSessionBlocked() const override {
110 return !IsActiveUserSessionStarted() || IsScreenLocked(); 110 return !IsActiveUserSessionStarted() || IsScreenLocked();
111 } 111 }
112
113 bool IsInSupervisedUserCreationFlow() const override {
114 }
115
112 SessionState GetSessionState() const override { 116 SessionState GetSessionState() const override {
113 // Assume that if session is not active we're at login. 117 // Assume that if session is not active we're at login.
114 return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE 118 return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
115 : SESSION_STATE_LOGIN_PRIMARY; 119 : SESSION_STATE_LOGIN_PRIMARY;
116 } 120 }
117 const user_manager::UserInfo* GetUserInfo( 121 const user_manager::UserInfo* GetUserInfo(
118 MultiProfileIndex index) const override { 122 MultiProfileIndex index) const override {
119 return user_info_.get(); 123 return user_info_.get();
120 } 124 }
121 const user_manager::UserInfo* GetUserInfo( 125 const user_manager::UserInfo* GetUserInfo(
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // Real GPU support depends on src/content, so just use a stub. 260 // Real GPU support depends on src/content, so just use a stub.
257 return new GPUSupportStub; 261 return new GPUSupportStub;
258 } 262 }
259 263
260 base::string16 ShellDelegateImpl::GetProductName() const { 264 base::string16 ShellDelegateImpl::GetProductName() const {
261 return base::string16(); 265 return base::string16();
262 } 266 }
263 267
264 } // namespace shell 268 } // namespace shell
265 } // namespace ash 269 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698