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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 return; | 403 return; |
404 const std::string key = property->second; | 404 const std::string key = property->second; |
405 delegate->ActivateIMEProperty(key); | 405 delegate->ActivateIMEProperty(key); |
406 } | 406 } |
407 | 407 |
408 GetWidget()->Close(); | 408 GetWidget()->Close(); |
409 } | 409 } |
410 | 410 |
411 void ImeListView::HandleButtonPressed(views::Button* sender, | 411 void ImeListView::HandleButtonPressed(views::Button* sender, |
412 const ui::Event& event) { | 412 const ui::Event& event) { |
413 DCHECK(material_keyboard_status_view_); | 413 if (material_keyboard_status_view_ && |
414 DCHECK_EQ(sender, material_keyboard_status_view_->toggle()); | 414 sender == material_keyboard_status_view_->toggle()) { |
415 WmShell::Get()->ToggleIgnoreExternalKeyboard(); | 415 WmShell::Get()->ToggleIgnoreExternalKeyboard(); |
| 416 } |
416 } | 417 } |
417 | 418 |
418 } // namespace ash | 419 } // namespace ash |
OLD | NEW |