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

Side by Side Diff: ash/system/chromeos/tray_display.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
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/system/chromeos/tray_display.h" 5 #include "ash/system/chromeos/tray_display.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/system_notifier.h" 10 #include "ash/system/system_notifier.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) { 113 switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) {
114 case user::LOGGED_IN_NONE: 114 case user::LOGGED_IN_NONE:
115 case user::LOGGED_IN_LOCKED: 115 case user::LOGGED_IN_LOCKED:
116 return; 116 return;
117 117
118 case user::LOGGED_IN_USER: 118 case user::LOGGED_IN_USER:
119 case user::LOGGED_IN_OWNER: 119 case user::LOGGED_IN_OWNER:
120 case user::LOGGED_IN_GUEST: 120 case user::LOGGED_IN_GUEST:
121 case user::LOGGED_IN_RETAIL_MODE: 121 case user::LOGGED_IN_RETAIL_MODE:
122 case user::LOGGED_IN_PUBLIC: 122 case user::LOGGED_IN_PUBLIC:
123 case user::LOGGED_IN_LOCALLY_MANAGED: 123 case user::LOGGED_IN_SUPERVISED:
124 case user::LOGGED_IN_KIOSK_APP: 124 case user::LOGGED_IN_KIOSK_APP:
125 Shell::GetInstance()->system_tray_delegate()->ShowDisplaySettings(); 125 Shell::GetInstance()->system_tray_delegate()->ShowDisplaySettings();
126 } 126 }
127 } 127 }
128 128
129 } // namespace 129 } // namespace
130 130
131 const char TrayDisplay::kNotificationId[] = "chrome://settings/display"; 131 const char TrayDisplay::kNotificationId[] = "chrome://settings/display";
132 132
133 class DisplayView : public ActionableView { 133 class DisplayView : public ActionableView {
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { 438 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
439 views::View* view = default_; 439 views::View* view = default_;
440 if (view) { 440 if (view) {
441 view->GetAccessibleState(state); 441 view->GetAccessibleState(state);
442 return true; 442 return true;
443 } 443 }
444 return false; 444 return false;
445 } 445 }
446 446
447 } // namespace ash 447 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/supervised/tray_supervised_user_unittest.cc ('k') | ash/system/system_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698