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

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

Issue 2673333002: Fix regression where no IMEs appear in the opt-in IME menu (Closed)
Patch Set: Created 3 years, 10 months 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
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 c038ebeb401b6c465f3337b44dda06427e24f432..670f4f9602ef4e8a09baee5311f672b7f5b4a388 100644
--- a/ash/common/system/chromeos/ime_menu/ime_list_view.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
@@ -227,13 +227,16 @@ class MaterialKeyboardStatusRowView : public views::View {
DISALLOW_COPY_AND_ASSIGN(MaterialKeyboardStatusRowView);
};
-ImeListView::ImeListView(SystemTrayItem* owner,
- bool show_keyboard_toggle,
- SingleImeBehavior single_ime_behavior)
+ImeListView::ImeListView(SystemTrayItem* owner)
: TrayDetailsView(owner),
last_item_selected_with_keyboard_(false),
should_focus_ime_after_selection_with_keyboard_(false),
- current_ime_view_(nullptr) {
+ current_ime_view_(nullptr) {}
+
+ImeListView::~ImeListView() {}
+
+void ImeListView::Init(bool show_keyboard_toggle,
+ SingleImeBehavior single_ime_behavior) {
SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
IMEInfoList list;
delegate->GetAvailableIMEList(&list);
@@ -242,8 +245,6 @@ ImeListView::ImeListView(SystemTrayItem* owner,
Update(list, property_list, show_keyboard_toggle, single_ime_behavior);
}
-ImeListView::~ImeListView() {}
-
void ImeListView::Update(const IMEInfoList& list,
const IMEPropertyInfoList& property_list,
bool show_keyboard_toggle,
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_list_view.h ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698