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

Unified Diff: ash/system/ime/tray_ime_chromeos_unittest.cc

Issue 2917683003: chromeos: Remove the last IME methods from ash::SystemTrayDelegate (Closed)
Patch Set: cleanup Created 3 years, 7 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
« no previous file with comments | « ash/system/ime/tray_ime_chromeos.cc ('k') | ash/system/ime_menu/ime_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/ime/tray_ime_chromeos_unittest.cc
diff --git a/ash/system/ime/tray_ime_chromeos_unittest.cc b/ash/system/ime/tray_ime_chromeos_unittest.cc
index a7b2fe471e21f5f5567621acb713216b0cac6ed1..a4c0ef54f26807a65c53825bf4565ddf95d6361e 100644
--- a/ash/system/ime/tray_ime_chromeos_unittest.cc
+++ b/ash/system/ime/tray_ime_chromeos_unittest.cc
@@ -8,6 +8,7 @@
#include "ash/accessibility_types.h"
#include "ash/public/cpp/config.h"
#include "ash/shell.h"
+#include "ash/system/ime/ime_util.h"
#include "ash/system/ime_menu/ime_list_view.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/test/ash_test_base.h"
@@ -19,7 +20,9 @@ namespace ash {
class TrayIMETest : public test::AshTestBase {
public:
- TrayIMETest() {}
+ TrayIMETest()
+ : scoped_current_ime_(&current_ime_),
+ scoped_available_ime_list_(&available_ime_list_) {}
~TrayIMETest() override {}
views::View* default_view() const { return default_view_.get(); }
@@ -48,6 +51,12 @@ class TrayIMETest : public test::AshTestBase {
void TearDown() override;
private:
+ IMEInfo current_ime_;
+ ime_util::ScopedCurrentImeForTesting scoped_current_ime_;
+
+ std::vector<IMEInfo> available_ime_list_;
+ ime_util::ScopedAvailableImeListForTesting scoped_available_ime_list_;
+
std::unique_ptr<TrayIME> tray_;
std::unique_ptr<views::View> default_view_;
std::unique_ptr<views::View> detailed_view_;
« no previous file with comments | « ash/system/ime/tray_ime_chromeos.cc ('k') | ash/system/ime_menu/ime_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698