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

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

Issue 2281473002: Revert of Updates the IME list when the IME has refreshed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 unified diff | Download patch
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_MENU_TRAY_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/system/ime/ime_observer.h" 9 #include "ash/common/system/ime/ime_observer.h"
10 #include "ash/common/system/tray/ime_info.h" 10 #include "ash/common/system/tray/ime_info.h"
11 #include "ash/common/system/tray/tray_background_view.h" 11 #include "ash/common/system/tray/tray_background_view.h"
12 #include "ash/common/system/tray/tray_bubble_wrapper.h" 12 #include "ash/common/system/tray/tray_bubble_wrapper.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "ui/views/bubble/tray_bubble_view.h" 14 #include "ui/views/bubble/tray_bubble_view.h"
15 15
16 namespace views { 16 namespace views {
17 class Label; 17 class Label;
18 } // namespace views 18 } // namespace views
19 19
20 namespace ash { 20 namespace ash {
21 class ImeListView;
22 class StatusAreaWidget; 21 class StatusAreaWidget;
23 class WmWindow; 22 class WmWindow;
24 23
25 // The tray item for IME menu, which shows the detailed view of a null single 24 // The tray item for IME menu, which shows the detailed view of a null single
26 // item. 25 // item.
27 class ASH_EXPORT ImeMenuTray : public TrayBackgroundView, 26 class ASH_EXPORT ImeMenuTray : public TrayBackgroundView,
28 public IMEObserver, 27 public IMEObserver,
29 public views::TrayBubbleView::Delegate { 28 public views::TrayBubbleView::Delegate {
30 public: 29 public:
31 explicit ImeMenuTray(WmShelf* wm_shelf); 30 explicit ImeMenuTray(WmShelf* wm_shelf);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 void UpdateTrayLabel(); 63 void UpdateTrayLabel();
65 64
66 // Shows the IME menu bubble and highlights the button. 65 // Shows the IME menu bubble and highlights the button.
67 void ShowImeMenuBubble(); 66 void ShowImeMenuBubble();
68 67
69 // Hides the IME menu bubble and lowlights the button. 68 // Hides the IME menu bubble and lowlights the button.
70 void HideImeMenuBubble(); 69 void HideImeMenuBubble();
71 70
72 // Bubble for default and detailed views. 71 // Bubble for default and detailed views.
73 std::unique_ptr<TrayBubbleWrapper> bubble_; 72 std::unique_ptr<TrayBubbleWrapper> bubble_;
74 ImeListView* ime_list_view_;
75 73
76 views::Label* label_; 74 views::Label* label_;
77 IMEInfo current_ime_; 75 IMEInfo current_ime_;
78 76
79 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); 77 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray);
80 }; 78 };
81 79
82 } // namespace ash 80 } // namespace ash
83 81
84 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 82 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
OLDNEW
« 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.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698