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

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

Issue 2607493002: Hide keyboard before showing IME menu. (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « no previous file | ash/common/system/chromeos/ime_menu/ime_menu_tray.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_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/chromeos/virtual_keyboard/virtual_keyboard_observer. h" 9 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer. h"
10 #include "ash/common/system/ime/ime_observer.h" 10 #include "ash/common/system/ime/ime_observer.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void OnKeyboardClosed() override; 85 void OnKeyboardClosed() override;
86 void OnKeyboardHidden() override; 86 void OnKeyboardHidden() override;
87 87
88 // VirtualKeyboardObserver: 88 // VirtualKeyboardObserver:
89 void OnKeyboardSuppressionChanged(bool suppressed) override; 89 void OnKeyboardSuppressionChanged(bool suppressed) override;
90 90
91 private: 91 private:
92 // To allow the test class to access |label_|. 92 // To allow the test class to access |label_|.
93 friend class ImeMenuTrayTest; 93 friend class ImeMenuTrayTest;
94 94
95 // Show the IME menu bubble immediately.
96 void ShowImeMenuBubbleInternal();
97
95 // Updates the text of the label on the tray. 98 // Updates the text of the label on the tray.
96 void UpdateTrayLabel(); 99 void UpdateTrayLabel();
97 100
98 // Bubble for default and detailed views. 101 // Bubble for default and detailed views.
99 std::unique_ptr<TrayBubbleWrapper> bubble_; 102 std::unique_ptr<TrayBubbleWrapper> bubble_;
100 ImeListView* ime_list_view_; 103 ImeListView* ime_list_view_;
101 104
102 views::Label* label_; 105 views::Label* label_;
103 IMEInfo current_ime_; 106 IMEInfo current_ime_;
104 bool show_keyboard_; 107 bool show_keyboard_;
105 bool force_show_keyboard_; 108 bool force_show_keyboard_;
106 bool should_block_shelf_auto_hide_; 109 bool should_block_shelf_auto_hide_;
107 bool keyboard_suppressed_; 110 bool keyboard_suppressed_;
111 bool show_bubble_after_keyboard_hidden_;
108 112
109 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); 113 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray);
110 }; 114 };
111 115
112 } // namespace ash 116 } // namespace ash
113 117
114 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 118 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | 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