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/brightness/tray_brightness.h" | 5 #include "ash/system/brightness/tray_brightness.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/system/brightness/brightness_control_delegate.h" | 9 #include "ash/system/brightness/brightness_control_delegate.h" |
10 #include "ash/system/tray/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 void TrayBrightness::HandleInitialBrightness(double percent) { | 154 void TrayBrightness::HandleInitialBrightness(double percent) { |
155 if (!got_current_percent_) | 155 if (!got_current_percent_) |
156 OnBrightnessChanged(percent, false); | 156 OnBrightnessChanged(percent, false); |
157 } | 157 } |
158 | 158 |
159 views::View* TrayBrightness::CreateTrayView(user::LoginStatus status) { | 159 views::View* TrayBrightness::CreateTrayView(user::LoginStatus status) { |
160 return NULL; | 160 return NULL; |
161 } | 161 } |
162 | 162 |
163 views::View* TrayBrightness::CreateDefaultView(user::LoginStatus status) { | 163 views::View* TrayBrightness::CreateDefaultView(user::LoginStatus status) { |
164 CHECK(brightness_view_ == NULL); | 164 return NULL; |
165 brightness_view_ = new tray::BrightnessView(current_percent_); | |
166 is_default_view_ = true; | |
167 return brightness_view_; | |
168 } | 165 } |
169 | 166 |
170 views::View* TrayBrightness::CreateDetailedView(user::LoginStatus status) { | 167 views::View* TrayBrightness::CreateDetailedView(user::LoginStatus status) { |
171 CHECK(brightness_view_ == NULL); | 168 CHECK(brightness_view_ == NULL); |
172 brightness_view_ = new tray::BrightnessView(current_percent_); | 169 brightness_view_ = new tray::BrightnessView(current_percent_); |
173 is_default_view_ = false; | 170 is_default_view_ = false; |
174 return brightness_view_; | 171 return brightness_view_; |
175 } | 172 } |
176 | 173 |
177 void TrayBrightness::DestroyTrayView() { | 174 void TrayBrightness::DestroyTrayView() { |
(...skipping 22 matching lines...) Expand all Loading... |
200 return; | 197 return; |
201 | 198 |
202 if (brightness_view_) | 199 if (brightness_view_) |
203 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); | 200 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); |
204 else | 201 else |
205 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); | 202 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); |
206 } | 203 } |
207 | 204 |
208 } // namespace internal | 205 } // namespace internal |
209 } // namespace ash | 206 } // namespace ash |
OLD | NEW |