| 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/ime/tray_ime_chromeos.h" | 5 #include "ash/common/system/ime/tray_ime_chromeos.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 AddLabel(label, gfx::ALIGN_LEFT, selected); | 56 AddLabel(label, gfx::ALIGN_LEFT, selected); |
| 57 } | 57 } |
| 58 | 58 |
| 59 ~SelectableHoverHighlightView() override {} | 59 ~SelectableHoverHighlightView() override {} |
| 60 | 60 |
| 61 protected: | 61 protected: |
| 62 // Overridden from views::View. | 62 // Overridden from views::View. |
| 63 void GetAccessibleNodeData(ui::AXNodeData* node_data) override { | 63 void GetAccessibleNodeData(ui::AXNodeData* node_data) override { |
| 64 HoverHighlightView::GetAccessibleNodeData(node_data); | 64 HoverHighlightView::GetAccessibleNodeData(node_data); |
| 65 node_data->role = ui::AX_ROLE_CHECK_BOX; | 65 node_data->role = ui::AX_ROLE_CHECK_BOX; |
| 66 if (selected_) | 66 const int checkedState = selected_ ? |
| 67 node_data->AddStateFlag(ui::AX_STATE_CHECKED); | 67 ui::AX_CHECKED_STATE_TRUE : ui::AX_CHECKED_STATE_FALSE; |
| 68 node_data->AddIntAttribute(ui::AX_ATTR_CHECKED_STATE, checkedState); |
| 68 } | 69 } |
| 69 | 70 |
| 70 private: | 71 private: |
| 71 bool selected_; | 72 bool selected_; |
| 72 | 73 |
| 73 DISALLOW_COPY_AND_ASSIGN(SelectableHoverHighlightView); | 74 DISALLOW_COPY_AND_ASSIGN(SelectableHoverHighlightView); |
| 74 }; | 75 }; |
| 75 | 76 |
| 76 class IMEDefaultView : public TrayItemMore { | 77 class IMEDefaultView : public TrayItemMore { |
| 77 public: | 78 public: |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 return ime_count >= threshold; | 377 return ime_count >= threshold; |
| 377 } | 378 } |
| 378 | 379 |
| 379 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() { | 380 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() { |
| 380 // If managed, we also want to show a single IME. | 381 // If managed, we also want to show a single IME. |
| 381 return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME | 382 return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME |
| 382 : ImeListView::HIDE_SINGLE_IME; | 383 : ImeListView::HIDE_SINGLE_IME; |
| 383 } | 384 } |
| 384 | 385 |
| 385 } // namespace ash | 386 } // namespace ash |
| OLD | NEW |