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

Side by Side Diff: ash/system/chromeos/supervised/tray_supervised_user.cc

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised/tray_supervised_user.h" 5 #include "ash/system/chromeos/supervised/tray_supervised_user.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/login_status.h" 9 #include "ash/common/login_status.h"
10 #include "ash/common/system/system_notifier.h" 10 #include "ash/common/system/system_notifier.h"
11 #include "ash/common/system/tray/label_tray_view.h"
11 #include "ash/common/system/tray/system_tray_delegate.h" 12 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "ash/common/system/tray/tray_notification_view.h" 13 #include "ash/common/system/tray/tray_notification_view.h"
13 #include "ash/common/wm_shell.h" 14 #include "ash/common/wm_shell.h"
14 #include "ash/system/chromeos/label_tray_view.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "grit/ash_resources.h" 17 #include "grit/ash_resources.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/message_center/message_center.h" 19 #include "ui/message_center/message_center.h"
20 #include "ui/message_center/notification.h" 20 #include "ui/message_center/notification.h"
21 #include "ui/message_center/notification_delegate.h" 21 #include "ui/message_center/notification_delegate.h"
22 22
23 using message_center::Notification; 23 using message_center::Notification;
24 24
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 // Not intended to be used for non-supervised users. 125 // Not intended to be used for non-supervised users.
126 CHECK(delegate->IsUserSupervised()); 126 CHECK(delegate->IsUserSupervised());
127 127
128 if (delegate->IsUserChild()) 128 if (delegate->IsUserChild())
129 return IDR_AURA_UBER_TRAY_CHILD_USER; 129 return IDR_AURA_UBER_TRAY_CHILD_USER;
130 return IDR_AURA_UBER_TRAY_SUPERVISED_USER; 130 return IDR_AURA_UBER_TRAY_SUPERVISED_USER;
131 } 131 }
132 132
133 } // namespace ash 133 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/session/tray_session_length_limit_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698