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

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

Issue 2686623003: Enable tests in TrayIMETest for MD (Closed)
Patch Set: Addressed review comments 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
« no previous file with comments | « no previous file | ash/common/system/chromeos/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/common/system/chromeos/ime_menu/ime_list_view.h
diff --git a/ash/common/system/chromeos/ime_menu/ime_list_view.h b/ash/common/system/chromeos/ime_menu/ime_list_view.h
index 9a1c7f1fd755560290e5edaa449311ceeaaf6f84..6c23f2d3d68cd2eb031c95c5662f1f7d5874c149 100644
--- a/ash/common/system/chromeos/ime_menu/ime_list_view.h
+++ b/ash/common/system/chromeos/ime_menu/ime_list_view.h
@@ -5,6 +5,7 @@
#ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
#define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
+#include "ash/ash_export.h"
#include "ash/common/system/tray/ime_info.h"
#include "ash/common/system/tray/tray_details_view.h"
#include "ui/views/controls/button/button.h"
@@ -63,8 +64,7 @@ class ImeListView : public TrayDetailsView {
void VisibilityChanged(View* starting_from, bool is_visible) override;
private:
- // To allow the test class to access |ime_map_|.
- friend class ImeMenuTrayTest;
+ friend class ImeListViewTestApi;
// Appends the IMEs to the scrollable area of the detailed view.
void AppendIMEList(const IMEInfoList& list);
@@ -112,6 +112,23 @@ class ImeListView : public TrayDetailsView {
DISALLOW_COPY_AND_ASSIGN(ImeListView);
};
+class ASH_EXPORT ImeListViewTestApi {
+ public:
+ explicit ImeListViewTestApi(ImeListView* ime_list_view);
+ virtual ~ImeListViewTestApi();
+
+ views::View* GetToggleView() const;
+
+ const std::map<views::View*, std::string>& ime_map() const {
+ return ime_list_view_->ime_map_;
+ }
+
+ private:
+ ImeListView* ime_list_view_;
+
+ DISALLOW_COPY_AND_ASSIGN(ImeListViewTestApi);
+};
+
} // namespace ash
#endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
« no previous file with comments | « no previous file | ash/common/system/chromeos/ime_menu/ime_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698