| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/brightness/tray_brightness.h" | 5 #include "ash/system/chromeos/brightness/tray_brightness.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
| 10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 delegate->GetBrightnessPercent( | 202 delegate->GetBrightnessPercent( |
| 203 base::Bind(&TrayBrightness::HandleInitialBrightness, | 203 base::Bind(&TrayBrightness::HandleInitialBrightness, |
| 204 weak_ptr_factory_.GetWeakPtr())); | 204 weak_ptr_factory_.GetWeakPtr())); |
| 205 } | 205 } |
| 206 | 206 |
| 207 void TrayBrightness::HandleInitialBrightness(double percent) { | 207 void TrayBrightness::HandleInitialBrightness(double percent) { |
| 208 if (!got_current_percent_) | 208 if (!got_current_percent_) |
| 209 HandleBrightnessChanged(percent, false); | 209 HandleBrightnessChanged(percent, false); |
| 210 } | 210 } |
| 211 | 211 |
| 212 views::View* TrayBrightness::CreateTrayView(user::LoginStatus status) { | 212 views::View* TrayBrightness::CreateTrayView(LoginStatus status) { |
| 213 return NULL; | 213 return NULL; |
| 214 } | 214 } |
| 215 | 215 |
| 216 views::View* TrayBrightness::CreateDefaultView(user::LoginStatus status) { | 216 views::View* TrayBrightness::CreateDefaultView(LoginStatus status) { |
| 217 CHECK(brightness_view_ == NULL); | 217 CHECK(brightness_view_ == NULL); |
| 218 brightness_view_ = new tray::BrightnessView(true, current_percent_); | 218 brightness_view_ = new tray::BrightnessView(true, current_percent_); |
| 219 return brightness_view_; | 219 return brightness_view_; |
| 220 } | 220 } |
| 221 | 221 |
| 222 views::View* TrayBrightness::CreateDetailedView(user::LoginStatus status) { | 222 views::View* TrayBrightness::CreateDetailedView(LoginStatus status) { |
| 223 CHECK(brightness_view_ == NULL); | 223 CHECK(brightness_view_ == NULL); |
| 224 Shell::GetInstance()->metrics()->RecordUserMetricsAction( | 224 Shell::GetInstance()->metrics()->RecordUserMetricsAction( |
| 225 ash::UMA_STATUS_AREA_DETAILED_BRIGHTNESS_VIEW); | 225 ash::UMA_STATUS_AREA_DETAILED_BRIGHTNESS_VIEW); |
| 226 brightness_view_ = new tray::BrightnessView(false, current_percent_); | 226 brightness_view_ = new tray::BrightnessView(false, current_percent_); |
| 227 return brightness_view_; | 227 return brightness_view_; |
| 228 } | 228 } |
| 229 | 229 |
| 230 void TrayBrightness::DestroyTrayView() { | 230 void TrayBrightness::DestroyTrayView() { |
| 231 } | 231 } |
| 232 | 232 |
| 233 void TrayBrightness::DestroyDefaultView() { | 233 void TrayBrightness::DestroyDefaultView() { |
| 234 if (brightness_view_ && brightness_view_->is_default_view()) | 234 if (brightness_view_ && brightness_view_->is_default_view()) |
| 235 brightness_view_ = NULL; | 235 brightness_view_ = NULL; |
| 236 } | 236 } |
| 237 | 237 |
| 238 void TrayBrightness::DestroyDetailedView() { | 238 void TrayBrightness::DestroyDetailedView() { |
| 239 if (brightness_view_ && !brightness_view_->is_default_view()) | 239 if (brightness_view_ && !brightness_view_->is_default_view()) |
| 240 brightness_view_ = NULL; | 240 brightness_view_ = NULL; |
| 241 } | 241 } |
| 242 | 242 |
| 243 void TrayBrightness::UpdateAfterLoginStatusChange(user::LoginStatus status) { | 243 void TrayBrightness::UpdateAfterLoginStatusChange(LoginStatus status) {} |
| 244 } | |
| 245 | 244 |
| 246 bool TrayBrightness::ShouldHideArrow() const { | 245 bool TrayBrightness::ShouldHideArrow() const { |
| 247 return true; | 246 return true; |
| 248 } | 247 } |
| 249 | 248 |
| 250 bool TrayBrightness::ShouldShowShelf() const { | 249 bool TrayBrightness::ShouldShowShelf() const { |
| 251 return false; | 250 return false; |
| 252 } | 251 } |
| 253 | 252 |
| 254 void TrayBrightness::BrightnessChanged(int level, bool user_initiated) { | 253 void TrayBrightness::BrightnessChanged(int level, bool user_initiated) { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 275 if (!display::Display::HasInternalDisplay()) | 274 if (!display::Display::HasInternalDisplay()) |
| 276 return; | 275 return; |
| 277 | 276 |
| 278 if (brightness_view_) | 277 if (brightness_view_) |
| 279 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); | 278 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); |
| 280 else | 279 else |
| 281 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); | 280 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); |
| 282 } | 281 } |
| 283 | 282 |
| 284 } // namespace ash | 283 } // namespace ash |
| OLD | NEW |