| 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 f000e4cf319d05032c825225cafa60ab9a05eec1..01ee6486d32b122952d0eb7d09116cc1f7d4f715 100644
|
| --- a/ash/common/system/chromeos/ime_menu/ime_list_view.cc
|
| +++ b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
|
| @@ -8,6 +8,7 @@
|
| #include "ash/common/system/tray/hover_highlight_view.h"
|
| #include "ash/common/system/tray/ime_info.h"
|
| #include "ash/common/system/tray/system_menu_button.h"
|
| +#include "ash/common/system/tray/system_menu_toggle_button.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| #include "ash/common/system/tray/tray_constants.h"
|
| #include "ash/common/system/tray/tray_details_view.h"
|
| @@ -27,7 +28,6 @@
|
| #include "ui/keyboard/keyboard_util.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/border.h"
|
| -#include "ui/views/controls/button/toggle_button.h"
|
| #include "ui/views/controls/image_view.h"
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/controls/separator.h"
|
| @@ -222,11 +222,8 @@ class MaterialKeyboardStatusRowView : public views::View {
|
| tri_view->AddView(TriView::Container::CENTER, label_);
|
|
|
| // The on-screen keyboard toggle button.
|
| - toggle_ = new views::ToggleButton(listener_);
|
| - toggle_->SetFocusForPlatform();
|
| - toggle_->SetAccessibleName(
|
| - ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
|
| - IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD));
|
| + toggle_ = new SystemMenuToggleButton(
|
| + listener_, IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD);
|
| tri_view->AddView(TriView::Container::END, toggle_);
|
| }
|
|
|
| @@ -244,7 +241,7 @@ class MaterialKeyboardStatusRowView : public views::View {
|
| views::Label* label_;
|
|
|
| // ToggleButton to toggle keyboard on or off.
|
| - views::ToggleButton* toggle_;
|
| + SystemMenuToggleButton* toggle_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MaterialKeyboardStatusRowView);
|
| };
|
|
|