| 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/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/shell/panel_window.h" | 8 #include "ash/shell/panel_window.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "ash/system/audio/tray_volume.h" | 10 #include "ash/system/audio/tray_volume.h" |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 bluetooth_observer_ = tray_bluetooth; | 180 bluetooth_observer_ = tray_bluetooth; |
| 181 brightness_observer_ = tray_brightness; | 181 brightness_observer_ = tray_brightness; |
| 182 caps_lock_observer_ = tray_caps_lock; | 182 caps_lock_observer_ = tray_caps_lock; |
| 183 clock_observer_ = tray_date; | 183 clock_observer_ = tray_date; |
| 184 drive_observer_ = tray_drive; | 184 drive_observer_ = tray_drive; |
| 185 ime_observer_ = tray_ime; | 185 ime_observer_ = tray_ime; |
| 186 locale_observer_ = tray_locale; | 186 locale_observer_ = tray_locale; |
| 187 network_observer_ = tray_network; | 187 network_observer_ = tray_network; |
| 188 power_status_observers_.AddObserver(tray_power); | 188 power_status_observers_.AddObserver(tray_power); |
| 189 power_status_observers_.AddObserver(tray_settings); | 189 power_status_observers_.AddObserver(tray_settings); |
| 190 sms_observer_ = tray_sms; |
| 190 update_observer_ = tray_update; | 191 update_observer_ = tray_update; |
| 191 user_observer_ = tray_user; | 192 user_observer_ = tray_user; |
| 192 | 193 |
| 193 AddTrayItem(tray_user); | 194 AddTrayItem(tray_user); |
| 194 AddTrayItem(tray_power); | 195 AddTrayItem(tray_power); |
| 195 AddTrayItem(tray_network); | 196 AddTrayItem(tray_network); |
| 196 AddTrayItem(tray_bluetooth); | 197 AddTrayItem(tray_bluetooth); |
| 197 AddTrayItem(tray_sms); | 198 AddTrayItem(tray_sms); |
| 198 AddTrayItem(tray_drive); | 199 AddTrayItem(tray_drive); |
| 199 AddTrayItem(tray_ime); | 200 AddTrayItem(tray_ime); |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 | 556 |
| 556 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) { | 557 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) { |
| 557 // The tray itself expands to the right and bottom edge of the screen to make | 558 // The tray itself expands to the right and bottom edge of the screen to make |
| 558 // sure clicking on the edges brings up the popup. However, the focus border | 559 // sure clicking on the edges brings up the popup. However, the focus border |
| 559 // should be only around the container. | 560 // should be only around the container. |
| 560 if (GetWidget() && GetWidget()->IsActive()) | 561 if (GetWidget() && GetWidget()->IsActive()) |
| 561 canvas->DrawFocusRect(tray_container_->bounds()); | 562 canvas->DrawFocusRect(tray_container_->bounds()); |
| 562 } | 563 } |
| 563 | 564 |
| 564 } // namespace ash | 565 } // namespace ash |
| OLD | NEW |