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

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

Issue 2480353008: cros system menu - fix back and settings buttons in IME detailed view. (Closed)
Patch Set: lockdown 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
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/ash_view_ids.h" 7 #include "ash/common/ash_view_ids.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/system/tray/hover_highlight_view.h" 9 #include "ash/common/system/tray/hover_highlight_view.h"
10 #include "ash/common/system/tray/ime_info.h" 10 #include "ash/common/system/tray/ime_info.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 property_map_.find(view); 392 property_map_.find(view);
393 if (property == property_map_.end()) 393 if (property == property_map_.end())
394 return; 394 return;
395 const std::string key = property->second; 395 const std::string key = property->second;
396 delegate->ActivateIMEProperty(key); 396 delegate->ActivateIMEProperty(key);
397 } 397 }
398 398
399 GetWidget()->Close(); 399 GetWidget()->Close();
400 } 400 }
401 401
402 void ImeListView::ButtonPressed(views::Button* sender, const ui::Event& event) { 402 void ImeListView::HandleButtonPressed(views::Button* sender,
403 const ui::Event& event) {
403 DCHECK(material_keyboard_status_view_); 404 DCHECK(material_keyboard_status_view_);
404 DCHECK_EQ(sender, material_keyboard_status_view_->toggle()); 405 DCHECK_EQ(sender, material_keyboard_status_view_->toggle());
405 WmShell::Get()->ToggleIgnoreExternalKeyboard(); 406 WmShell::Get()->ToggleIgnoreExternalKeyboard();
406 } 407 }
407 408
408 } // namespace ash 409 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_list_view.h ('k') | ash/common/system/tray/tray_details_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698