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

Side by Side Diff: chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/chromeos/profiles/avatar_menu_actions_chromeos.h" 5 #include "chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h"
6 6
7 #include "ash/multi_profile_uma.h" 7 #include "ash/multi_profile_uma.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "chrome/browser/chromeos/login/users/user_manager.h" 10 #include "chrome/browser/chromeos/login/users/user_manager.h"
(...skipping 19 matching lines...) Expand all
30 ash::MultiProfileUMA::SIGNIN_USER_BY_BROWSER_FRAME); 30 ash::MultiProfileUMA::SIGNIN_USER_BY_BROWSER_FRAME);
31 ash::Shell::GetInstance()->system_tray_delegate()->ShowUserLogin(); 31 ash::Shell::GetInstance()->system_tray_delegate()->ShowUserLogin();
32 } 32 }
33 33
34 void AvatarMenuActionsChromeOS::EditProfile(Profile* profile, size_t index) { 34 void AvatarMenuActionsChromeOS::EditProfile(Profile* profile, size_t index) {
35 NOTIMPLEMENTED(); 35 NOTIMPLEMENTED();
36 } 36 }
37 37
38 bool AvatarMenuActionsChromeOS::ShouldShowAddNewProfileLink() const { 38 bool AvatarMenuActionsChromeOS::ShouldShowAddNewProfileLink() const {
39 // |browser_| can be NULL in unit_tests. 39 // |browser_| can be NULL in unit_tests.
40 return (!browser_ || !browser_->profile()->IsManaged()) && 40 return (!browser_ || !browser_->profile()->IsSupervised()) &&
41 UserManager::Get()->GetUsersAdmittedForMultiProfile().size(); 41 UserManager::Get()->GetUsersAdmittedForMultiProfile().size();
42 } 42 }
43 43
44 bool AvatarMenuActionsChromeOS::ShouldShowEditProfileLink() const { 44 bool AvatarMenuActionsChromeOS::ShouldShowEditProfileLink() const {
45 return false; 45 return false;
46 } 46 }
47 47
48 void AvatarMenuActionsChromeOS::ActiveBrowserChanged(Browser* browser) { 48 void AvatarMenuActionsChromeOS::ActiveBrowserChanged(Browser* browser) {
49 browser_ = browser; 49 browser_ = browser;
50 } 50 }
51 51
52 } // namespace chromeos 52 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/session/session_manager.cc ('k') | chrome/browser/chromeos/profiles/profile_list_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698