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

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

Issue 2686623003: Enable tests in TrayIMETest for MD (Closed)
Patch Set: nit 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..717450fc198997e1e274bd277d318fd0491124e8 100644
--- a/ash/common/system/chromeos/ime_menu/ime_list_view.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
@@ -180,7 +180,7 @@ class MaterialKeyboardStatusRowView : public views::View {
~MaterialKeyboardStatusRowView() override {}
- const views::Button* toggle() const { return toggle_; }
+ views::Button* toggle() const { return toggle_; }
bool is_toggled() const { return toggle_->is_on(); }
protected:
@@ -455,4 +455,16 @@ void ImeListView::FocusCurrentImeIfNeeded() {
}
}
+ImeListViewTestApi::ImeListViewTestApi(ImeListView* ime_list_view)
+ : ime_list_view_(ime_list_view) {}
+
+ImeListViewTestApi::~ImeListViewTestApi() {}
+
+views::View* ImeListViewTestApi::GetToggleView() const {
+ if (MaterialDesignController::IsSystemTrayMenuMaterial())
+ return ime_list_view_->material_keyboard_status_view_->toggle();
+
+ return ime_list_view_->keyboard_status_;
tdanderson 2017/02/07 23:27:57 Since none of the tests are being run in non-MD an
mohsen 2017/02/08 02:13:50 Right. Done.
+}
+
} // namespace ash
« 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_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698