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

Side by Side Diff: ash/system/date/tray_system_info.cc

Issue 2821363002: cros: Disable system tray help/lock buttons during supervised user creation (Closed)
Patch Set: fix browser test Created 3 years, 8 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
« no previous file with comments | « ash/system/date/system_info_default_view.cc ('k') | ash/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/date/tray_system_info.h" 5 #include "ash/system/date/tray_system_info.h"
6 6
7 #include "ash/shelf/wm_shelf_util.h" 7 #include "ash/shelf/wm_shelf_util.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/date/date_view.h" 9 #include "ash/system/date/date_view.h"
10 #include "ash/system/date/system_info_default_view.h" 10 #include "ash/system/date/system_info_default_view.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 IsHorizontalAlignment(system_tray()->shelf_alignment()) 46 IsHorizontalAlignment(system_tray()->shelf_alignment())
47 ? tray::TimeView::ClockLayout::HORIZONTAL_CLOCK 47 ? tray::TimeView::ClockLayout::HORIZONTAL_CLOCK
48 : tray::TimeView::ClockLayout::VERTICAL_CLOCK; 48 : tray::TimeView::ClockLayout::VERTICAL_CLOCK;
49 tray_view_ = new tray::TimeView(clock_layout); 49 tray_view_ = new tray::TimeView(clock_layout);
50 views::View* view = new TrayItemView(this); 50 views::View* view = new TrayItemView(this);
51 view->AddChildView(tray_view_); 51 view->AddChildView(tray_view_);
52 return view; 52 return view;
53 } 53 }
54 54
55 views::View* TraySystemInfo::CreateDefaultView(LoginStatus status) { 55 views::View* TraySystemInfo::CreateDefaultView(LoginStatus status) {
56 default_view_ = new SystemInfoDefaultView(this, status); 56 default_view_ = new SystemInfoDefaultView(this);
57 57
58 // Save the login status we created the view with. 58 // Save the login status we created the view with.
59 login_status_ = status; 59 login_status_ = status;
60 60
61 OnSystemClockCanSetTimeChanged(system_clock_observer_->can_set_time()); 61 OnSystemClockCanSetTimeChanged(system_clock_observer_->can_set_time());
62 return default_view_; 62 return default_view_;
63 } 63 }
64 64
65 void TraySystemInfo::DestroyTrayView() { 65 void TraySystemInfo::DestroyTrayView() {
66 tray_view_ = nullptr; 66 tray_view_ = nullptr;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 104 }
105 105
106 void TraySystemInfo::UpdateTimeFormat() { 106 void TraySystemInfo::UpdateTimeFormat() {
107 if (tray_view_) 107 if (tray_view_)
108 tray_view_->UpdateTimeFormat(); 108 tray_view_->UpdateTimeFormat();
109 if (default_view_) 109 if (default_view_)
110 default_view_->GetDateView()->UpdateTimeFormat(); 110 default_view_->GetDateView()->UpdateTimeFormat();
111 } 111 }
112 112
113 } // namespace ash 113 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/system_info_default_view.cc ('k') | ash/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698