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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 425293002: Rename "managed (mode|user)" to "supervised user" (part 9) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/ui/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 return base::string16(); 381 return base::string16();
382 return UserManager::Get()->GetSupervisedUserManager()->GetManagerDisplayName( 382 return UserManager::Get()->GetSupervisedUserManager()->GetManagerDisplayName(
383 chromeos::UserManager::Get()->GetActiveUser()->email()); 383 chromeos::UserManager::Get()->GetActiveUser()->email());
384 } 384 }
385 385
386 const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage() 386 const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage()
387 const { 387 const {
388 if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED) 388 if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
389 return base::string16(); 389 return base::string16();
390 return l10n_util::GetStringFUTF16( 390 return l10n_util::GetStringFUTF16(
391 IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE, 391 IDS_USER_IS_SUPERVISED_BY_NOTICE,
392 base::UTF8ToUTF16(GetSupervisedUserManager())); 392 base::UTF8ToUTF16(GetSupervisedUserManager()));
393 } 393 }
394 394
395 bool SystemTrayDelegateChromeOS::SystemShouldUpgrade() const { 395 bool SystemTrayDelegateChromeOS::SystemShouldUpgrade() const {
396 return UpgradeDetector::GetInstance()->notify_upgrade(); 396 return UpgradeDetector::GetInstance()->notify_upgrade();
397 } 397 }
398 398
399 base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const { 399 base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
400 return clock_type_; 400 return clock_type_;
401 } 401 }
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 accessibility_subscription_.reset(); 1263 accessibility_subscription_.reset();
1264 else 1264 else
1265 OnAccessibilityModeChanged(details.notify); 1265 OnAccessibilityModeChanged(details.notify);
1266 } 1266 }
1267 1267
1268 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1268 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1269 return new SystemTrayDelegateChromeOS(); 1269 return new SystemTrayDelegateChromeOS();
1270 } 1270 }
1271 1271
1272 } // namespace chromeos 1272 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698