| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/chromeos/ime_menu/ime_list_view.h" | 5 #include "ash/common/system/chromeos/ime_menu/ime_list_view.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/system/tray/hover_highlight_view.h" | 8 #include "ash/common/system/tray/hover_highlight_view.h" |
| 9 #include "ash/common/system/tray/ime_info.h" | 9 #include "ash/common/system/tray/ime_info.h" |
| 10 #include "ash/common/system/tray/system_menu_button.h" | 10 #include "ash/common/system/tray/system_menu_button.h" |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 if (single_ime_behavior == ImeListView::SHOW_SINGLE_IME || list.size() > 1) { | 264 if (single_ime_behavior == ImeListView::SHOW_SINGLE_IME || list.size() > 1) { |
| 265 if (MaterialDesignController::IsSystemTrayMenuMaterial()) { | 265 if (MaterialDesignController::IsSystemTrayMenuMaterial()) { |
| 266 AppendImeListAndProperties(list, property_list); | 266 AppendImeListAndProperties(list, property_list); |
| 267 } else { | 267 } else { |
| 268 AppendIMEList(list); | 268 AppendIMEList(list); |
| 269 if (!property_list.empty()) | 269 if (!property_list.empty()) |
| 270 AppendIMEProperties(property_list); | 270 AppendIMEProperties(property_list); |
| 271 } | 271 } |
| 272 } | 272 } |
| 273 | 273 |
| 274 show_keyboard_toggle = true; |
| 274 if (show_keyboard_toggle) { | 275 if (show_keyboard_toggle) { |
| 275 if (MaterialDesignController::IsSystemTrayMenuMaterial()) { | 276 if (MaterialDesignController::IsSystemTrayMenuMaterial()) { |
| 276 PrependMaterialKeyboardStatus(); | 277 PrependMaterialKeyboardStatus(); |
| 277 } else { | 278 } else { |
| 278 if (list.size() > 1 || !property_list.empty()) | 279 if (list.size() > 1 || !property_list.empty()) |
| 279 AddScrollSeparator(); | 280 AddScrollSeparator(); |
| 280 AppendKeyboardStatus(); | 281 AppendKeyboardStatus(); |
| 281 } | 282 } |
| 282 } | 283 } |
| 283 | 284 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 | 400 |
| 400 void ImeListView::HandleButtonPressed(views::Button* sender, | 401 void ImeListView::HandleButtonPressed(views::Button* sender, |
| 401 const ui::Event& event) { | 402 const ui::Event& event) { |
| 402 if (material_keyboard_status_view_ && | 403 if (material_keyboard_status_view_ && |
| 403 sender == material_keyboard_status_view_->toggle()) { | 404 sender == material_keyboard_status_view_->toggle()) { |
| 404 WmShell::Get()->ToggleIgnoreExternalKeyboard(); | 405 WmShell::Get()->ToggleIgnoreExternalKeyboard(); |
| 405 } | 406 } |
| 406 } | 407 } |
| 407 | 408 |
| 408 } // namespace ash | 409 } // namespace ash |
| OLD | NEW |