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

Side by Side Diff: ash/common/system/chromeos/ime_menu/ime_list_view.cc

Issue 2518963004: 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 return; 389 return;
390 const std::string key = property->second; 390 const std::string key = property->second;
391 delegate->ActivateIMEProperty(key); 391 delegate->ActivateIMEProperty(key);
392 } 392 }
393 393
394 GetWidget()->Close(); 394 GetWidget()->Close();
395 } 395 }
396 396
397 void ImeListView::HandleButtonPressed(views::Button* sender, 397 void ImeListView::HandleButtonPressed(views::Button* sender,
398 const ui::Event& event) { 398 const ui::Event& event) {
399 DCHECK(material_keyboard_status_view_); 399 if (material_keyboard_status_view_ &&
400 DCHECK_EQ(sender, material_keyboard_status_view_->toggle()); 400 sender == material_keyboard_status_view_->toggle()) {
401 WmShell::Get()->ToggleIgnoreExternalKeyboard(); 401 WmShell::Get()->ToggleIgnoreExternalKeyboard();
402 }
402 } 403 }
403 404
404 } // namespace ash 405 } // namespace ash
OLDNEW
« 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