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

Side by Side Diff: ash/common/system/chromeos/ime_menu/ime_list_view.h

Issue 2480353008: cros system menu - fix back and settings buttons in IME detailed view. (Closed)
Patch Set: lockdown Created 4 years, 1 month 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
7 7
8 #include "ash/common/system/tray/ime_info.h" 8 #include "ash/common/system/tray/ime_info.h"
9 #include "ash/common/system/tray/tray_details_view.h" 9 #include "ash/common/system/tray/tray_details_view.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
(...skipping 18 matching lines...) Expand all
29 ~ImeListView() override; 29 ~ImeListView() override;
30 30
31 // Updates the view. 31 // Updates the view.
32 virtual void Update(const IMEInfoList& list, 32 virtual void Update(const IMEInfoList& list,
33 const IMEPropertyInfoList& property_list, 33 const IMEPropertyInfoList& property_list,
34 bool show_keyboard_toggle, 34 bool show_keyboard_toggle,
35 SingleImeBehavior single_ime_behavior); 35 SingleImeBehavior single_ime_behavior);
36 36
37 // TrayDetailsView: 37 // TrayDetailsView:
38 void HandleViewClicked(views::View* view) override; 38 void HandleViewClicked(views::View* view) override;
39 39 void HandleButtonPressed(views::Button* sender,
40 // views::ButtonListener: 40 const ui::Event& event) override;
41 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
42 41
43 private: 42 private:
44 // To allow the test class to access |ime_map_|. 43 // To allow the test class to access |ime_map_|.
45 friend class ImeMenuTrayTest; 44 friend class ImeMenuTrayTest;
46 45
47 // Removes (and destroys) all child views. 46 // Removes (and destroys) all child views.
48 void ResetImeListView(); 47 void ResetImeListView();
49 48
50 // Appends the IMEs to the scrollable area of the detailed view. 49 // Appends the IMEs to the scrollable area of the detailed view.
51 void AppendIMEList(const IMEInfoList& list); 50 void AppendIMEList(const IMEInfoList& list);
(...skipping 19 matching lines...) Expand all
71 views::View* keyboard_status_; 70 views::View* keyboard_status_;
72 // On-screen keyboard view which is only used in material design. 71 // On-screen keyboard view which is only used in material design.
73 MaterialKeyboardStatusRowView* material_keyboard_status_view_; 72 MaterialKeyboardStatusRowView* material_keyboard_status_view_;
74 73
75 DISALLOW_COPY_AND_ASSIGN(ImeListView); 74 DISALLOW_COPY_AND_ASSIGN(ImeListView);
76 }; 75 };
77 76
78 } // namespace ash 77 } // namespace ash
79 78
80 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ 79 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
OLDNEW
« 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