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

Side by Side Diff: ash/common/system/chromeos/settings/tray_settings.cc

Issue 2162153002: Added Ash.SystemMenu.DefaultView.VisibleItems histogram. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed ash_unittests compile errors. 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 (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/common/system/chromeos/settings/tray_settings.h" 5 #include "ash/common/system/chromeos/settings/tray_settings.h"
6 6
7 #include "ash/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/system/chromeos/power/power_status.h" 8 #include "ash/common/system/chromeos/power/power_status.h"
9 #include "ash/common/system/chromeos/power/power_status_view.h" 9 #include "ash/common/system/chromeos/power/power_status_view.h"
10 #include "ash/common/system/tray/actionable_view.h" 10 #include "ash/common/system/tray/actionable_view.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 LoginStatus login_status_; 119 LoginStatus login_status_;
120 views::Label* label_; 120 views::Label* label_;
121 ash::PowerStatusView* power_status_view_; 121 ash::PowerStatusView* power_status_view_;
122 122
123 DISALLOW_COPY_AND_ASSIGN(SettingsDefaultView); 123 DISALLOW_COPY_AND_ASSIGN(SettingsDefaultView);
124 }; 124 };
125 125
126 } // namespace tray 126 } // namespace tray
127 127
128 TraySettings::TraySettings(SystemTray* system_tray) 128 TraySettings::TraySettings(SystemTray* system_tray)
129 : SystemTrayItem(system_tray), default_view_(NULL) {} 129 : SystemTrayItem(system_tray, OS_SETTINGS), default_view_(NULL) {}
tdanderson 2016/07/19 21:58:39 Just SETTINGS instead of OS_SETTINGS to match clas
bruthig 2016/07/20 18:15:52 Done.
130 130
131 TraySettings::~TraySettings() {} 131 TraySettings::~TraySettings() {}
132 132
133 views::View* TraySettings::CreateTrayView(LoginStatus status) { 133 views::View* TraySettings::CreateTrayView(LoginStatus status) {
134 return NULL; 134 return NULL;
135 } 135 }
136 136
137 views::View* TraySettings::CreateDefaultView(LoginStatus status) { 137 views::View* TraySettings::CreateDefaultView(LoginStatus status) {
138 if ((status == LoginStatus::NOT_LOGGED_IN || status == LoginStatus::LOCKED) && 138 if ((status == LoginStatus::NOT_LOGGED_IN || status == LoginStatus::LOCKED) &&
139 !PowerStatus::Get()->IsBatteryPresent()) 139 !PowerStatus::Get()->IsBatteryPresent())
(...skipping 14 matching lines...) Expand all
154 154
155 void TraySettings::DestroyDefaultView() { 155 void TraySettings::DestroyDefaultView() {
156 default_view_ = NULL; 156 default_view_ = NULL;
157 } 157 }
158 158
159 void TraySettings::DestroyDetailedView() {} 159 void TraySettings::DestroyDetailedView() {}
160 160
161 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {} 161 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
162 162
163 } // namespace ash 163 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698