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

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

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 if (system_tray_delegate) 42 if (system_tray_delegate)
43 system_tray_delegate->RemoveCustodianInfoTrayObserver(this); 43 system_tray_delegate->RemoveCustodianInfoTrayObserver(this);
44 } 44 }
45 45
46 void TraySupervisedUser::UpdateMessage() { 46 void TraySupervisedUser::UpdateMessage() {
47 base::string16 message = 47 base::string16 message =
48 WmShell::Get()->system_tray_delegate()->GetSupervisedUserMessage(); 48 WmShell::Get()->system_tray_delegate()->GetSupervisedUserMessage();
49 if (tray_view_) 49 if (tray_view_)
50 tray_view_->SetMessage(message); 50 tray_view_->SetMessage(message);
51 if (message_center::MessageCenter::Get()->FindVisibleNotificationById( 51 if (message_center::MessageCenter::Get()->FindVisibleNotificationById(
52 kNotificationId)) 52 kNotificationId))
53 CreateOrUpdateNotification(message); 53 CreateOrUpdateNotification(message);
54 } 54 }
55 55
56 views::View* TraySupervisedUser::CreateDefaultView(LoginStatus status) { 56 views::View* TraySupervisedUser::CreateDefaultView(LoginStatus status) {
57 CHECK(tray_view_ == NULL); 57 CHECK(tray_view_ == NULL);
58 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate(); 58 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
59 if (!delegate->IsUserSupervised()) 59 if (!delegate->IsUserSupervised())
60 return NULL; 60 return NULL;
61 61
62 tray_view_ = new LabelTrayView(this, GetSupervisedUserIconId()); 62 tray_view_ = new LabelTrayView(this, GetSupervisedUserIconId());
(...skipping 61 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/supervised/tray_supervised_user.h ('k') | ash/system/chromeos/supervised/tray_supervised_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698