| Index: ash/common/system/ime/tray_ime_chromeos.cc
|
| diff --git a/ash/common/system/ime/tray_ime_chromeos.cc b/ash/common/system/ime/tray_ime_chromeos.cc
|
| index 9d7dbb364a9e7a738fa17ae43e72ff0f04cca213..b60952b51ac8baa4eaad52702ed8cad4c36f38f8 100644
|
| --- a/ash/common/system/ime/tray_ime_chromeos.cc
|
| +++ b/ash/common/system/ime/tray_ime_chromeos.cc
|
| @@ -151,6 +151,11 @@ class IMEDetailedView : public ImeListView {
|
| ShowSettings();
|
| }
|
|
|
| + void ResetImeListView() override {
|
| + ImeListView::ResetImeListView();
|
| + settings_button_ = nullptr;
|
| + }
|
| +
|
| void HandleButtonPressed(views::Button* sender,
|
| const ui::Event& event) override {
|
| ImeListView::HandleButtonPressed(sender, event);
|
| @@ -160,11 +165,6 @@ class IMEDetailedView : public ImeListView {
|
|
|
| void CreateExtraTitleRowButtons() override {
|
| if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
|
| - // It is possible that the settings button has already been created
|
| - // through a previous call to Update().
|
| - if (settings_button_)
|
| - return;
|
| -
|
| tri_view()->SetContainerVisible(TriView::Container::END, true);
|
| settings_button_ = CreateSettingsButton(login_);
|
| tri_view()->AddView(TriView::Container::END, settings_button_);
|
|
|