Chromium Code Reviews| 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/tray/tray_utils.h" | 5 #include "ash/common/system/tray/tray_utils.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/session/session_state_delegate.h" | |
| 8 #include "ash/common/shelf/wm_shelf_util.h" | 9 #include "ash/common/shelf/wm_shelf_util.h" |
| 9 #include "ash/common/system/tray/tray_constants.h" | 10 #include "ash/common/system/tray/tray_constants.h" |
| 10 #include "ash/common/system/tray/tray_item_view.h" | 11 #include "ash/common/system/tray/tray_item_view.h" |
| 12 #include "ash/common/wm_shell.h" | |
| 11 #include "ui/accessibility/ax_view_state.h" | 13 #include "ui/accessibility/ax_view_state.h" |
| 12 #include "ui/gfx/font_list.h" | 14 #include "ui/gfx/font_list.h" |
| 13 #include "ui/gfx/geometry/vector2d.h" | 15 #include "ui/gfx/geometry/vector2d.h" |
| 14 #include "ui/views/border.h" | 16 #include "ui/views/border.h" |
| 15 #include "ui/views/controls/label.h" | 17 #include "ui/views/controls/label.h" |
| 16 | 18 |
| 17 namespace ash { | 19 namespace ash { |
| 18 | 20 |
| 19 void SetupLabelForTray(views::Label* label) { | 21 void SetupLabelForTray(views::Label* label) { |
| 20 if (MaterialDesignController::IsShelfMaterial()) { | 22 if (MaterialDesignController::IsShelfMaterial()) { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 | 81 |
| 80 // Do not descend into static text labels which may compute their own labels | 82 // Do not descend into static text labels which may compute their own labels |
| 81 // recursively. | 83 // recursively. |
| 82 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT) | 84 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT) |
| 83 return; | 85 return; |
| 84 | 86 |
| 85 for (int i = 0; i < view->child_count(); ++i) | 87 for (int i = 0; i < view->child_count(); ++i) |
| 86 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels); | 88 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels); |
| 87 } | 89 } |
| 88 | 90 |
| 91 bool CanOpenWebUISettings(LoginStatus status) { | |
|
bruthig
2016/10/19 15:43:09
It seems kind of odd that we query the TrayUtils t
tdanderson
2016/10/19 19:49:31
Added a corresponding TODO.
bruthig
2016/10/19 20:17:58
Acknowledged.
| |
| 92 return status != LoginStatus::NOT_LOGGED_IN && | |
| 93 status != LoginStatus::LOCKED && | |
| 94 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen(); | |
| 95 } | |
| 96 | |
| 89 } // namespace ash | 97 } // namespace ash |
| OLD | NEW |