Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: ash/common/system/chromeos/ime_menu/ime_list_view.cc

Issue 2513713002: Fix button-pressed handling in ImeDetailedView (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/ime_menu/ime_list_view.cc
diff --git a/ash/common/system/chromeos/ime_menu/ime_list_view.cc b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
index dd1ae9e33afe6a9bda8d74d95e2e5b2eabce91bb..ea11d25f91254fd666f28d05dd0d800e8c7ffc08 100644
--- a/ash/common/system/chromeos/ime_menu/ime_list_view.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
@@ -410,9 +410,10 @@ void ImeListView::HandleViewClicked(views::View* view) {
void ImeListView::HandleButtonPressed(views::Button* sender,
const ui::Event& event) {
- DCHECK(material_keyboard_status_view_);
- DCHECK_EQ(sender, material_keyboard_status_view_->toggle());
- WmShell::Get()->ToggleIgnoreExternalKeyboard();
+ if (material_keyboard_status_view_ &&
+ sender == material_keyboard_status_view_->toggle()) {
+ WmShell::Get()->ToggleIgnoreExternalKeyboard();
+ }
}
} // namespace ash
« no previous file with comments | « no previous file | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698