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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; | 577 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; |
578 state->name = l10n_util::GetStringUTF16( | 578 state->name = l10n_util::GetStringUTF16( |
579 IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME); | 579 IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME); |
580 } | 580 } |
581 | 581 |
582 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) { | 582 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) { |
583 // The tray itself expands to the right and bottom edge of the screen to make | 583 // The tray itself expands to the right and bottom edge of the screen to make |
584 // sure clicking on the edges brings up the popup. However, the focus border | 584 // sure clicking on the edges brings up the popup. However, the focus border |
585 // should be only around the container. | 585 // should be only around the container. |
586 if (GetWidget() && GetWidget()->IsActive()) | 586 if (GetWidget() && GetWidget()->IsActive()) |
587 canvas->DrawFocusRect(tray_container_->bounds()); | 587 DrawBorder(canvas, GetContentsBounds()); |
588 } | 588 } |
589 | 589 |
590 } // namespace ash | 590 } // namespace ash |
OLD | NEW |