OLD | NEW |
---|---|
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/tray/test_system_tray_delegate.h" | 5 #include "ash/system/tray/test_system_tray_delegate.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_delegate.h" | 8 #include "ash/shell_delegate.h" |
9 #include "ash/volume_control_delegate.h" | 9 #include "ash/volume_control_delegate.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
85 // but there's no browser session available yet so use SessionStarted(). | 85 // but there's no browser session available yet so use SessionStarted(). |
86 if (!Shell::GetInstance()->delegate()->IsSessionStarted()) | 86 if (!Shell::GetInstance()->delegate()->IsSessionStarted()) |
87 return ash::user::LOGGED_IN_NONE; | 87 return ash::user::LOGGED_IN_NONE; |
88 if (Shell::GetInstance()->IsScreenLocked()) | 88 if (Shell::GetInstance()->IsScreenLocked()) |
89 return user::LOGGED_IN_LOCKED; | 89 return user::LOGGED_IN_LOCKED; |
90 // TODO(nkostylev): Support LOGGED_IN_OWNER, LOGGED_IN_GUEST, LOGGED_IN_KIOSK, | 90 // TODO(nkostylev): Support LOGGED_IN_OWNER, LOGGED_IN_GUEST, LOGGED_IN_KIOSK, |
91 // LOGGED_IN_PUBLIC. | 91 // LOGGED_IN_PUBLIC. |
92 return user::LOGGED_IN_USER; | 92 return user::LOGGED_IN_USER; |
93 } | 93 } |
94 | 94 |
95 const std::string TestSystemTrayDelegate::GetEnterpriseDomain() const { | |
96 return ""; | |
msw
2012/11/29 01:14:10
nit: return std::string();
bartfab (slow)
2012/11/29 16:28:59
Done.
| |
97 } | |
98 | |
95 bool TestSystemTrayDelegate::SystemShouldUpgrade() const { | 99 bool TestSystemTrayDelegate::SystemShouldUpgrade() const { |
96 return true; | 100 return true; |
97 } | 101 } |
98 | 102 |
99 base::HourClockType TestSystemTrayDelegate::GetHourClockType() const { | 103 base::HourClockType TestSystemTrayDelegate::GetHourClockType() const { |
100 return base::k24HourClock; | 104 return base::k24HourClock; |
101 } | 105 } |
102 | 106 |
103 PowerSupplyStatus TestSystemTrayDelegate::GetPowerSupplyStatus() const { | 107 PowerSupplyStatus TestSystemTrayDelegate::GetPowerSupplyStatus() const { |
104 return PowerSupplyStatus(); | 108 return PowerSupplyStatus(); |
(...skipping 19 matching lines...) Expand all Loading... | |
124 | 128 |
125 void TestSystemTrayDelegate::ShowDriveSettings() { | 129 void TestSystemTrayDelegate::ShowDriveSettings() { |
126 } | 130 } |
127 | 131 |
128 void TestSystemTrayDelegate::ShowIMESettings() { | 132 void TestSystemTrayDelegate::ShowIMESettings() { |
129 } | 133 } |
130 | 134 |
131 void TestSystemTrayDelegate::ShowHelp() { | 135 void TestSystemTrayDelegate::ShowHelp() { |
132 } | 136 } |
133 | 137 |
138 void TestSystemTrayDelegate::ShowPublicAccountInfo() { | |
139 } | |
140 | |
134 void TestSystemTrayDelegate::ShutDown() { | 141 void TestSystemTrayDelegate::ShutDown() { |
135 MessageLoop::current()->Quit(); | 142 MessageLoop::current()->Quit(); |
136 } | 143 } |
137 | 144 |
138 void TestSystemTrayDelegate::SignOut() { | 145 void TestSystemTrayDelegate::SignOut() { |
139 MessageLoop::current()->Quit(); | 146 MessageLoop::current()->Quit(); |
140 } | 147 } |
141 | 148 |
142 void TestSystemTrayDelegate::RequestLockScreen() { | 149 void TestSystemTrayDelegate::RequestLockScreen() { |
143 } | 150 } |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
286 return volume_control_delegate_.get(); | 293 return volume_control_delegate_.get(); |
287 } | 294 } |
288 | 295 |
289 void TestSystemTrayDelegate::SetVolumeControlDelegate( | 296 void TestSystemTrayDelegate::SetVolumeControlDelegate( |
290 scoped_ptr<VolumeControlDelegate> delegate) { | 297 scoped_ptr<VolumeControlDelegate> delegate) { |
291 volume_control_delegate_ = delegate.Pass(); | 298 volume_control_delegate_ = delegate.Pass(); |
292 } | 299 } |
293 | 300 |
294 } // namespace test | 301 } // namespace test |
295 } // namespace ash | 302 } // namespace ash |
OLD | NEW |