| 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/common/system/status_area_widget.h" | 5 #include "ash/common/system/status_area_widget.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
| 8 #include "ash/common/shell_window_ids.h" | 8 #include "ash/common/shell_window_ids.h" |
| 9 #include "ash/common/system/overview/overview_button_tray.h" | 9 #include "ash/common/system/overview/overview_button_tray.h" |
| 10 #include "ash/common/system/status_area_widget_delegate.h" | 10 #include "ash/common/system/status_area_widget_delegate.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 #endif | 137 #endif |
| 138 overview_button_tray_->SchedulePaint(); | 138 overview_button_tray_->SchedulePaint(); |
| 139 } | 139 } |
| 140 | 140 |
| 141 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) { | 141 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) { |
| 142 Widget::OnNativeWidgetActivationChanged(active); | 142 Widget::OnNativeWidgetActivationChanged(active); |
| 143 if (active) | 143 if (active) |
| 144 status_area_widget_delegate_->SetPaneFocusAndFocusDefault(); | 144 status_area_widget_delegate_->SetPaneFocusAndFocusDefault(); |
| 145 } | 145 } |
| 146 | 146 |
| 147 void StatusAreaWidget::OnMouseEvent(ui::MouseEvent* event) { | |
| 148 Widget::OnMouseEvent(event); | |
| 149 wm_shelf_->UpdateAutoHideForMouseEvent(event); | |
| 150 } | |
| 151 | |
| 152 void StatusAreaWidget::OnGestureEvent(ui::GestureEvent* event) { | |
| 153 Widget::OnGestureEvent(event); | |
| 154 wm_shelf_->UpdateAutoHideForGestureEvent(event); | |
| 155 } | |
| 156 | |
| 157 void StatusAreaWidget::UpdateShelfItemBackground(int alpha) { | 147 void StatusAreaWidget::UpdateShelfItemBackground(int alpha) { |
| 158 web_notification_tray_->UpdateShelfItemBackground(alpha); | 148 web_notification_tray_->UpdateShelfItemBackground(alpha); |
| 159 system_tray_->UpdateShelfItemBackground(alpha); | 149 system_tray_->UpdateShelfItemBackground(alpha); |
| 160 #if defined(OS_CHROMEOS) | 150 #if defined(OS_CHROMEOS) |
| 161 virtual_keyboard_tray_->UpdateShelfItemBackground(alpha); | 151 virtual_keyboard_tray_->UpdateShelfItemBackground(alpha); |
| 162 logout_button_tray_->UpdateShelfItemBackground(alpha); | 152 logout_button_tray_->UpdateShelfItemBackground(alpha); |
| 163 ime_menu_tray_->UpdateShelfItemBackground(alpha); | 153 ime_menu_tray_->UpdateShelfItemBackground(alpha); |
| 164 palette_tray_->UpdateShelfItemBackground(alpha); | 154 palette_tray_->UpdateShelfItemBackground(alpha); |
| 165 #endif | 155 #endif |
| 166 overview_button_tray_->UpdateShelfItemBackground(alpha); | 156 overview_button_tray_->UpdateShelfItemBackground(alpha); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); | 226 web_notification_tray_->UpdateAfterLoginStatusChange(login_status); |
| 237 #if defined(OS_CHROMEOS) | 227 #if defined(OS_CHROMEOS) |
| 238 if (logout_button_tray_) | 228 if (logout_button_tray_) |
| 239 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); | 229 logout_button_tray_->UpdateAfterLoginStatusChange(login_status); |
| 240 #endif | 230 #endif |
| 241 if (overview_button_tray_) | 231 if (overview_button_tray_) |
| 242 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); | 232 overview_button_tray_->UpdateAfterLoginStatusChange(login_status); |
| 243 } | 233 } |
| 244 | 234 |
| 245 } // namespace ash | 235 } // namespace ash |
| OLD | NEW |