| 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/common/ash_constants.h" | 10 #include "ash/common/ash_constants.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 | 45 |
| 46 } // namespace | 46 } // namespace |
| 47 | 47 |
| 48 class BrightnessView : public ShellObserver, | 48 class BrightnessView : public ShellObserver, |
| 49 public views::View, | 49 public views::View, |
| 50 public views::SliderListener { | 50 public views::SliderListener { |
| 51 public: | 51 public: |
| 52 BrightnessView(bool default_view, double initial_percent); | 52 BrightnessView(bool default_view, double initial_percent); |
| 53 ~BrightnessView() override; | 53 ~BrightnessView() override; |
| 54 | 54 |
| 55 bool is_default_view() const { | 55 bool is_default_view() const { return is_default_view_; } |
| 56 return is_default_view_; | |
| 57 } | |
| 58 | 56 |
| 59 // |percent| is in the range [0.0, 100.0]. | 57 // |percent| is in the range [0.0, 100.0]. |
| 60 void SetBrightnessPercent(double percent); | 58 void SetBrightnessPercent(double percent); |
| 61 | 59 |
| 62 // ShellObserver: | 60 // ShellObserver: |
| 63 void OnMaximizeModeStarted() override; | 61 void OnMaximizeModeStarted() override; |
| 64 void OnMaximizeModeEnded() override; | 62 void OnMaximizeModeEnded() override; |
| 65 | 63 |
| 66 private: | 64 private: |
| 67 // views::View: | 65 // views::View: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 90 double last_percent_; | 88 double last_percent_; |
| 91 | 89 |
| 92 DISALLOW_COPY_AND_ASSIGN(BrightnessView); | 90 DISALLOW_COPY_AND_ASSIGN(BrightnessView); |
| 93 }; | 91 }; |
| 94 | 92 |
| 95 BrightnessView::BrightnessView(bool default_view, double initial_percent) | 93 BrightnessView::BrightnessView(bool default_view, double initial_percent) |
| 96 : dragging_(false), | 94 : dragging_(false), |
| 97 is_default_view_(default_view), | 95 is_default_view_(default_view), |
| 98 last_percent_(initial_percent) { | 96 last_percent_(initial_percent) { |
| 99 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, | 97 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, |
| 100 kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingBetweenItems)); | 98 kTrayPopupPaddingHorizontal, 0, |
| 99 kTrayPopupPaddingBetweenItems)); |
| 101 | 100 |
| 102 views::ImageView* icon = new FixedSizedImageView(0, kTrayPopupItemHeight); | 101 views::ImageView* icon = new FixedSizedImageView(0, kTrayPopupItemHeight); |
| 103 gfx::Image image = ui::ResourceBundle::GetSharedInstance().GetImageNamed( | 102 gfx::Image image = ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| 104 IDR_AURA_UBER_TRAY_BRIGHTNESS); | 103 IDR_AURA_UBER_TRAY_BRIGHTNESS); |
| 105 icon->SetImage(image.ToImageSkia()); | 104 icon->SetImage(image.ToImageSkia()); |
| 106 AddChildView(icon); | 105 AddChildView(icon); |
| 107 | 106 |
| 108 slider_ = new views::Slider(this, views::Slider::HORIZONTAL); | 107 slider_ = new views::Slider(this, views::Slider::HORIZONTAL); |
| 109 slider_->set_focus_border_color(kFocusBorderColor); | 108 slider_->set_focus_border_color(kFocusBorderColor); |
| 110 slider_->SetValue(static_cast<float>(initial_percent / 100.0)); | 109 slider_->SetValue(static_cast<float>(initial_percent / 100.0)); |
| 111 slider_->SetAccessibleName( | 110 slider_->SetAccessibleName( |
| 112 ui::ResourceBundle::GetSharedInstance().GetLocalizedString( | 111 ui::ResourceBundle::GetSharedInstance().GetLocalizedString( |
| 113 IDS_ASH_STATUS_TRAY_BRIGHTNESS)); | 112 IDS_ASH_STATUS_TRAY_BRIGHTNESS)); |
| 114 AddChildView(slider_); | 113 AddChildView(slider_); |
| 115 | 114 |
| 116 if (is_default_view_) { | 115 if (is_default_view_) { |
| 117 WmShell::Get()->AddShellObserver(this); | 116 WmShell::Get()->AddShellObserver(this); |
| 118 SetVisible(Shell::GetInstance()->maximize_mode_controller()-> | 117 SetVisible(Shell::GetInstance() |
| 119 IsMaximizeModeWindowManagerEnabled()); | 118 ->maximize_mode_controller() |
| 119 ->IsMaximizeModeWindowManagerEnabled()); |
| 120 } | 120 } |
| 121 } | 121 } |
| 122 | 122 |
| 123 BrightnessView::~BrightnessView() { | 123 BrightnessView::~BrightnessView() { |
| 124 if (is_default_view_) | 124 if (is_default_view_) |
| 125 WmShell::Get()->RemoveShellObserver(this); | 125 WmShell::Get()->RemoveShellObserver(this); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void BrightnessView::SetBrightnessPercent(double percent) { | 128 void BrightnessView::SetBrightnessPercent(double percent) { |
| 129 last_percent_ = percent; | 129 last_percent_ = percent; |
| 130 if (!dragging_) | 130 if (!dragging_) |
| 131 slider_->SetValue(static_cast<float>(percent / 100.0)); | 131 slider_->SetValue(static_cast<float>(percent / 100.0)); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void BrightnessView::OnMaximizeModeStarted() { | 134 void BrightnessView::OnMaximizeModeStarted() { |
| 135 SetVisible(true); | 135 SetVisible(true); |
| 136 } | 136 } |
| 137 | 137 |
| 138 void BrightnessView::OnMaximizeModeEnded() { | 138 void BrightnessView::OnMaximizeModeEnded() { |
| 139 SetVisible(false); | 139 SetVisible(false); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void BrightnessView::OnBoundsChanged(const gfx::Rect& old_bounds) { | 142 void BrightnessView::OnBoundsChanged(const gfx::Rect& old_bounds) { |
| 143 int w = width() - slider_->x(); | 143 int w = width() - slider_->x(); |
| 144 slider_->SetSize(gfx::Size(w, slider_->height())); | 144 slider_->SetSize(gfx::Size(w, slider_->height())); |
| 145 } | 145 } |
| 146 | 146 |
| 147 void BrightnessView::SliderValueChanged(views::Slider* sender, | 147 void BrightnessView::SliderValueChanged(views::Slider* sender, |
| 148 float value, | 148 float value, |
| 149 float old_value, | 149 float old_value, |
| 150 views::SliderChangeReason reason) { | 150 views::SliderChangeReason reason) { |
| 151 DCHECK_EQ(sender, slider_); | 151 DCHECK_EQ(sender, slider_); |
| 152 if (reason != views::VALUE_CHANGED_BY_USER) | 152 if (reason != views::VALUE_CHANGED_BY_USER) |
| 153 return; | 153 return; |
| 154 AcceleratorController* ac = Shell::GetInstance()->accelerator_controller(); | 154 AcceleratorController* ac = Shell::GetInstance()->accelerator_controller(); |
| 155 if (ac->brightness_control_delegate()) { | 155 if (ac->brightness_control_delegate()) { |
| 156 double percent = std::max(value * 100.0, kMinBrightnessPercent); | 156 double percent = std::max(value * 100.0, kMinBrightnessPercent); |
| 157 ac->brightness_control_delegate()->SetBrightnessPercent(percent, true); | 157 ac->brightness_control_delegate()->SetBrightnessPercent(percent, true); |
| 158 } | 158 } |
| 159 } | 159 } |
| 160 | 160 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 175 : SystemTrayItem(system_tray), | 175 : SystemTrayItem(system_tray), |
| 176 brightness_view_(NULL), | 176 brightness_view_(NULL), |
| 177 current_percent_(100.0), | 177 current_percent_(100.0), |
| 178 got_current_percent_(false), | 178 got_current_percent_(false), |
| 179 weak_ptr_factory_(this) { | 179 weak_ptr_factory_(this) { |
| 180 // Post a task to get the initial brightness; the BrightnessControlDelegate | 180 // Post a task to get the initial brightness; the BrightnessControlDelegate |
| 181 // isn't created yet. | 181 // isn't created yet. |
| 182 base::ThreadTaskRunnerHandle::Get()->PostTask( | 182 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 183 FROM_HERE, base::Bind(&TrayBrightness::GetInitialBrightness, | 183 FROM_HERE, base::Bind(&TrayBrightness::GetInitialBrightness, |
| 184 weak_ptr_factory_.GetWeakPtr())); | 184 weak_ptr_factory_.GetWeakPtr())); |
| 185 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 185 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver( |
| 186 AddObserver(this); | 186 this); |
| 187 } | 187 } |
| 188 | 188 |
| 189 TrayBrightness::~TrayBrightness() { | 189 TrayBrightness::~TrayBrightness() { |
| 190 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 190 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver( |
| 191 RemoveObserver(this); | 191 this); |
| 192 } | 192 } |
| 193 | 193 |
| 194 void TrayBrightness::GetInitialBrightness() { | 194 void TrayBrightness::GetInitialBrightness() { |
| 195 BrightnessControlDelegate* delegate = | 195 BrightnessControlDelegate* delegate = Shell::GetInstance() |
| 196 Shell::GetInstance()->accelerator_controller()-> | 196 ->accelerator_controller() |
| 197 brightness_control_delegate(); | 197 ->brightness_control_delegate(); |
| 198 // Worrisome, but happens in unit tests, so don't log anything. | 198 // Worrisome, but happens in unit tests, so don't log anything. |
| 199 if (!delegate) | 199 if (!delegate) |
| 200 return; | 200 return; |
| 201 delegate->GetBrightnessPercent( | 201 delegate->GetBrightnessPercent( |
| 202 base::Bind(&TrayBrightness::HandleInitialBrightness, | 202 base::Bind(&TrayBrightness::HandleInitialBrightness, |
| 203 weak_ptr_factory_.GetWeakPtr())); | 203 weak_ptr_factory_.GetWeakPtr())); |
| 204 } | 204 } |
| 205 | 205 |
| 206 void TrayBrightness::HandleInitialBrightness(double percent) { | 206 void TrayBrightness::HandleInitialBrightness(double percent) { |
| 207 if (!got_current_percent_) | 207 if (!got_current_percent_) |
| (...skipping 11 matching lines...) Expand all Loading... |
| 219 } | 219 } |
| 220 | 220 |
| 221 views::View* TrayBrightness::CreateDetailedView(LoginStatus status) { | 221 views::View* TrayBrightness::CreateDetailedView(LoginStatus status) { |
| 222 CHECK(brightness_view_ == NULL); | 222 CHECK(brightness_view_ == NULL); |
| 223 WmShell::Get()->RecordUserMetricsAction( | 223 WmShell::Get()->RecordUserMetricsAction( |
| 224 UMA_STATUS_AREA_DETAILED_BRIGHTNESS_VIEW); | 224 UMA_STATUS_AREA_DETAILED_BRIGHTNESS_VIEW); |
| 225 brightness_view_ = new tray::BrightnessView(false, current_percent_); | 225 brightness_view_ = new tray::BrightnessView(false, current_percent_); |
| 226 return brightness_view_; | 226 return brightness_view_; |
| 227 } | 227 } |
| 228 | 228 |
| 229 void TrayBrightness::DestroyTrayView() { | 229 void TrayBrightness::DestroyTrayView() {} |
| 230 } | |
| 231 | 230 |
| 232 void TrayBrightness::DestroyDefaultView() { | 231 void TrayBrightness::DestroyDefaultView() { |
| 233 if (brightness_view_ && brightness_view_->is_default_view()) | 232 if (brightness_view_ && brightness_view_->is_default_view()) |
| 234 brightness_view_ = NULL; | 233 brightness_view_ = NULL; |
| 235 } | 234 } |
| 236 | 235 |
| 237 void TrayBrightness::DestroyDetailedView() { | 236 void TrayBrightness::DestroyDetailedView() { |
| 238 if (brightness_view_ && !brightness_view_->is_default_view()) | 237 if (brightness_view_ && !brightness_view_->is_default_view()) |
| 239 brightness_view_ = NULL; | 238 brightness_view_ = NULL; |
| 240 } | 239 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 if (!display::Display::HasInternalDisplay()) | 271 if (!display::Display::HasInternalDisplay()) |
| 273 return; | 272 return; |
| 274 | 273 |
| 275 if (brightness_view_) | 274 if (brightness_view_) |
| 276 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); | 275 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds); |
| 277 else | 276 else |
| 278 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); | 277 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); |
| 279 } | 278 } |
| 280 | 279 |
| 281 } // namespace ash | 280 } // namespace ash |
| OLD | NEW |