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

Side by Side Diff: chrome/browser/ui/ash/session_state_delegate_views.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) 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 "chrome/browser/ui/ash/session_state_delegate_views.h" 5 #include "chrome/browser/ui/ash/session_state_delegate_views.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/user_manager/empty_user_info.h" 10 #include "components/user_manager/empty_user_info.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void SessionStateDelegate::LockScreen() { 55 void SessionStateDelegate::LockScreen() {
56 } 56 }
57 57
58 void SessionStateDelegate::UnlockScreen() { 58 void SessionStateDelegate::UnlockScreen() {
59 } 59 }
60 60
61 bool SessionStateDelegate::IsUserSessionBlocked() const { 61 bool SessionStateDelegate::IsUserSessionBlocked() const {
62 return false; 62 return false;
63 } 63 }
64 64
65 bool IsInSupervisedUserCreationFlow() const override {
66 return false;
67 }
68
69 void SetIsInSupervisedUserCreationFlow(bool is_in_flow) override {
70 }
71
65 ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState() 72 ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState()
66 const { 73 const {
67 return SESSION_STATE_ACTIVE; 74 return SESSION_STATE_ACTIVE;
68 } 75 }
69 76
70 const user_manager::UserInfo* SessionStateDelegate::GetUserInfo( 77 const user_manager::UserInfo* SessionStateDelegate::GetUserInfo(
71 ash::MultiProfileIndex index) const { 78 ash::MultiProfileIndex index) const {
72 return GetUserInfo(static_cast<content::BrowserContext*>(NULL)); 79 return GetUserInfo(static_cast<content::BrowserContext*>(NULL));
73 } 80 }
74 81
(...skipping 22 matching lines...) Expand all
97 104
98 void SessionStateDelegate::AddSessionStateObserver( 105 void SessionStateDelegate::AddSessionStateObserver(
99 ash::SessionStateObserver* observer) { 106 ash::SessionStateObserver* observer) {
100 NOTIMPLEMENTED(); 107 NOTIMPLEMENTED();
101 } 108 }
102 109
103 void SessionStateDelegate::RemoveSessionStateObserver( 110 void SessionStateDelegate::RemoveSessionStateObserver(
104 ash::SessionStateObserver* observer) { 111 ash::SessionStateObserver* observer) {
105 NOTIMPLEMENTED(); 112 NOTIMPLEMENTED();
106 } 113 }
OLDNEW
« ash/shelf/shelf_layout_manager.cc ('K') | « chrome/browser/ui/ash/session_state_delegate_views.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698