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

Side by Side Diff: ash/shelf/shelf_widget.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 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/ash.gyp ('k') | ash/system/chromeos/managed/tray_locally_managed_user.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) 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/shelf/shelf_widget.h" 5 #include "ash/shelf/shelf_widget.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/focus_cycler.h" 8 #include "ash/focus_cycler.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 bool ShelfWidget::ShelfAlignmentAllowed() { 681 bool ShelfWidget::ShelfAlignmentAllowed() {
682 user::LoginStatus login_status = 682 user::LoginStatus login_status =
683 Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus(); 683 Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
684 684
685 switch (login_status) { 685 switch (login_status) {
686 case user::LOGGED_IN_USER: 686 case user::LOGGED_IN_USER:
687 case user::LOGGED_IN_OWNER: 687 case user::LOGGED_IN_OWNER:
688 return true; 688 return true;
689 case user::LOGGED_IN_LOCKED: 689 case user::LOGGED_IN_LOCKED:
690 case user::LOGGED_IN_PUBLIC: 690 case user::LOGGED_IN_PUBLIC:
691 case user::LOGGED_IN_LOCALLY_MANAGED: 691 case user::LOGGED_IN_SUPERVISED:
692 case user::LOGGED_IN_GUEST: 692 case user::LOGGED_IN_GUEST:
693 case user::LOGGED_IN_RETAIL_MODE: 693 case user::LOGGED_IN_RETAIL_MODE:
694 case user::LOGGED_IN_KIOSK_APP: 694 case user::LOGGED_IN_KIOSK_APP:
695 case user::LOGGED_IN_NONE: 695 case user::LOGGED_IN_NONE:
696 return false; 696 return false;
697 } 697 }
698 698
699 DCHECK(false); 699 DCHECK(false);
700 return false; 700 return false;
701 } 701 }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 DCHECK(delegate_view_); 801 DCHECK(delegate_view_);
802 return delegate_view_->disable_dimming_animations_for_test(); 802 return delegate_view_->disable_dimming_animations_for_test();
803 } 803 }
804 804
805 void ShelfWidget::WillDeleteShelf() { 805 void ShelfWidget::WillDeleteShelf() {
806 shelf_layout_manager_->RemoveObserver(this); 806 shelf_layout_manager_->RemoveObserver(this);
807 shelf_layout_manager_ = NULL; 807 shelf_layout_manager_ = NULL;
808 } 808 }
809 809
810 } // namespace ash 810 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/system/chromeos/managed/tray_locally_managed_user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698